omf_sfa 0.2.2 → 0.2.3

data/bin/parse_rspec.rb

@@ -12,7 +12,7 @@ require 'rubygems'
 require 'optparse'
 require 'dm-core'
 require 'nokogiri'
-require 'omf_common/lobject'
+require 'omf_base/lobject'
 require 'json'
 
 $verbose = false
@@ -40,7 +40,7 @@ end
 op.on_tail('-h', "--help", "Show this message") { $stderr.puts op; exit }
 rest = op.parse(ARGV) || []
 
-OMF::Common::Loggable.init_log 'parse_rspec'
+OMF::Base::Loggable.init_log 'parse_rspec'
 
 unless in_file_name = (rest || [])[0]
   abort "Missing rspec file"
@@ -69,6 +69,7 @@ DataMapper.finalize
 # Process RSPEC
 resources = []
 context = {}
+rspec_type = rspec.attributes['type'].value
 rspec.children.each do |el|
   next if el.is_a? Nokogiri::XML::Text
   if $verbose
@@ -77,7 +78,7 @@ rspec.children.each do |el|
   end
   n = nil
   begin
-    n = OMF::SFA::Resource::OComponent.from_sfa(el, context)
+    n = OMF::SFA::Resource::OComponent.from_sfa(el, context, rspec_type)
   rescue Exception => ex
     puts "WARN: Couldn't parse '#{el.to_s[0 .. 30]}' - #{ex}"
     puts ex.backtrace
@@ -109,7 +110,7 @@ end
 
 def print_json(resources)
   resources.each do |r|
-    puts '================='
+    puts '=================' if $verbose
     r.urn
     #puts "#{r.type} (#{r.inspect})"\n
     puts "#{r.type}"
@@ -160,7 +161,7 @@ if $out_file_name
   f = File.open($out_file_name, 'w')
   f.write out
 else
-  puts '=========================='
+  puts '==========================' if $verbose
   puts out
 end
 

data/lib/omf-sfa/am/am-rest/rest_handler.rb

@@ -4,6 +4,7 @@ require 'nokogiri'
 require 'uuid'
 require 'set'
 require 'json'
+require 'thin/async'
 
 require 'omf_base/lobject'
 
@@ -119,6 +120,9 @@ module OMF::SFA::AM::Rest
           }, ""]
         end
         content_type, body = dispatch(req)
+        if body.is_a? Thin::AsyncResponse
+          return body.finish
+        end
         if req['_format'] == 'html'
           #body = self.class.convert_to_html(body, env, Set.new((@coll_handlers || {}).keys))
           body = convert_to_html(body, env, {}, Set.new((@coll_handlers || {}).keys))
@@ -219,7 +223,7 @@ module OMF::SFA::AM::Rest
       resource_id = opts[:resource_uri] = path.shift
       opts[:resource] = nil
       if resource_id
-        resource = opts[:resource] = find_resource(resource_id)
+        resource = opts[:resource] = find_resource(resource_id, {}, opts)
       end
       return self if path.empty?
 
@@ -402,7 +406,7 @@ module OMF::SFA::AM::Rest
 
 
 
-    def find_resource(resource_uri, description = {})
+    def find_resource(resource_uri, description = {}, opts = {})
       descr = description.dup
       descr.delete(:resource_uri)
       if UUID.validate(resource_uri)

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

@@ -95,11 +95,20 @@ module OMF::SFA::Resource
 
     def uuid
       unless @uuid
-        @uuid = UUIDTools::UUID.parse(short_name)
+        begin
+          @uuid = UUIDTools::UUID.parse(short_name)
+        rescue ArgumentError
+          if (p = short_name.split(':')).length > 1
+            # ExoGeni has short names of the form uuid:short_name
+            # TODO: This turned out to be not a sliver UUID, but something else
+            # begin
+              # @uuid = UUIDTools::UUID.parse(p[0])
+            # rescue ArgumentError
+            # end
+          end
+        end
       end
       @uuid
-    rescue ArgumentError
-      @uuid = nil
     end
 
     def to_s

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

@@ -8,6 +8,7 @@ module OMF::SFA::Resource
     #property :hardware_type, String
     oproperty :role, String
     oproperty :node, :node
+    oproperty :mac_address, String
     oproperty :channel, :channel
     oproperty :ip_addresses, OMF::SFA::Resource::Ip, :functional => false
 
@@ -23,6 +24,7 @@ module OMF::SFA::Resource
     #sfa :public_ipv4, :ip4, :attribute => true
     sfa :role, :attribute => true
     sfa :ip
+    sfa :mac_address, :attribute => true
 
     # @see IComponent
     #

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

@@ -12,6 +12,7 @@ module OMF::SFA::Resource
     #oproperty :sliver_type, String, :required => false
     oproperty :interfaces, :interface, :functional => false
     oproperty :exclusive, Boolean, :default => true
+
     #belongs_to :sliver
 
     sfa_class 'node'
@@ -19,7 +20,8 @@ module OMF::SFA::Resource
     sfa :available, :attr_value => 'now'  # <available now="true">
     #sfa :sliver_type, :attr_value => 'name'
     sfa :interfaces, :inline => true, :has_many => true
-#    sfa :exclusive, :attribute => true
+    sfa :exclusive, :attribute => true
+
 
     # Override xml serialization of 'interface'
     def _to_sfa_property_xml(pname, value, res_el, pdef, obj2id, opts)
@@ -54,6 +56,7 @@ module OMF::SFA::Resource
       end
     end
 
+
     def xx_to_sfa_interfaces_property_hash(interfaces, pdef, href2obj, opts)
       # opts = opts.dup
       # opts[:href_prefix] = (opts[:href_prefix] || '/') + 'interfaces/'

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

@@ -10,8 +10,9 @@ module OMF::SFA::Resource
   #
   class OComponent < OResource
 
-    oproperty :domain, String #, readonly => true
-    oproperty :exclusive, DataMapper::Property::Boolean
+    #oproperty :domain, String #, readonly => true
+
+    oproperty :component_gurn, OMF::SFA::Resource::GURN
     oproperty :component_manager_gurn, OMF::SFA::Resource::GURN
 
     # Status of component. Should be any of configuring, ready, failed, and unknown
@@ -26,6 +27,8 @@ module OMF::SFA::Resource
 
     oproperty :account, :account, :inverse => :active_components
 
+    oproperty :expiration_time, Time
+
     has n, :component_leases, :child_key => [:component_id]
     has n, :leases, :model => 'OLease', :through => :component_leases, :via => :lease
 
@@ -33,9 +36,12 @@ module OMF::SFA::Resource
     include OMF::SFA::Resource::Base::InstanceMethods
 
     sfa_add_namespace :omf, 'http://schema.mytestbed.net/sfa/rspec/1'
+    sfa_add_namespace :exo_sliver, "http://groups.geni.net/exogeni/attachment/wiki/RspecExtensions/sliver-info/1"
+    sfa_add_namespace :exo_slice, "http://groups.geni.net/exogeni/attachment/wiki/RspecExtensions/slice-info/1", ignore: true
+
     #sfa_add_namespace :ol, 'http://nitlab.inf.uth.gr/schema/sfa/rspec/1'
 
-    sfa :component_id, :attribute => true, :prop_name => :urn # "urn:publicid:IDN+plc:cornell+node+planetlab3-dsl.cs.cornell.edu"
+    sfa :component_id, :attribute => true, :prop_name => :component_gurn # "urn:publicid:IDN+plc:cornell+node+planetlab3-dsl.cs.cornell.edu"
 
     sfa :client_id, :attribute => true, :prop_name => :name
     alias_method :client_id, :name
@@ -44,6 +50,8 @@ module OMF::SFA::Resource
     sfa :component_name, :attribute => true # "plane
     sfa :leases, :inline => true, :has_many => true
 
+    sfa :exo_sliver__geni_sliver_info
+
     #def component_id
     #  res = oproperty_get(:id)
     #end
@@ -85,6 +93,17 @@ module OMF::SFA::Resource
       super
     end
 
+    def _from_sfa_exo_sliver__geni_sliver_info_property_xml(resource_el, props, context)
+      resource_el.children.filter("//*[local-name()='geni_sliver_info']").each do |si|
+        #puts ">>>> #{si.attributes}"
+        if value = si["expiration_time"]
+          self.expiration_time = Time.parse(value)
+        end
+        if value = si["state"]
+          self.status = value
+        end
+      end
+    end
 
     def clone
       clone = super
@@ -122,7 +141,7 @@ module OMF::SFA::Resource
     end
 
     before :save do
-      self.urn = GURN.create(self.name, self)
+      #self.urn = GURN.create(self.name, self) unless self.urn
     end
 
     def destroy!

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

@@ -299,7 +299,7 @@ module OMF::SFA::Resource
       self
     end
 
-    [:each, :each_with_index, :select, :map].each do |n|
+    [:each, :each_with_index, :select, :map, :find].each do |n|
       define_method n do |&block|
         #c = OProperty.all(name: @name, o_resource: @resource)
         c = self.to_a()

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

@@ -341,16 +341,18 @@ module OMF::SFA::Resource
       unless self.name
         self.name = self.urn ? GURN.create(self.urn).short_name : "r#{self.object_id}"
       end
-      unless self.urn
-        # The purpose or function of a URN is to provide a globally unique,
-        # persistent identifier used for recognition, for access to
-        # characteristics of the resource or for access to the resource
-        # itself.
-        # source: http://tools.ietf.org/html/rfc1737
-        #
-        name = self.name
-        self.urn = GURN.create(name, :model => self.class).to_s
-      end
+      # The uuid already provides a unique identifier. The URN is a more readable one, but
+      # it doesn't make sense for each resource, so leave it to the creator to set one or not.
+      # unless self.urn
+        # # The purpose or function of a URN is to provide a globally unique,
+        # # persistent identifier used for recognition, for access to
+        # # characteristics of the resource or for access to the resource
+        # # itself.
+        # # source: http://tools.ietf.org/html/rfc1737
+        # #
+        # name = self.name
+        # self.urn = GURN.create(name, :model => self.class).to_s
+      # end
     end
 
     def destroy
@@ -449,6 +451,7 @@ module OMF::SFA::Resource
     end
 
     def to_hash_long(h, objs = {}, opts = {})
+      h[:urn] = self.urn if self.urn
       _oprops_to_hash(h, objs, opts)
       h
     end

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

@@ -27,6 +27,7 @@ module OMF::SFA
 
         @@sfa_defs = {}
         @@sfa_namespaces = {}
+        @@sfa_namespace2prefix = {}
         @@sfa_classes = {}
         @@sfa_name2class = {}
 
@@ -46,15 +47,21 @@ module OMF::SFA
           end
         end
 
-        def sfa_add_namespace(prefix, urn)
-          @@sfa_namespaces[prefix] = urn
+        def sfa_add_namespace(prefix, urn, options = {})
+          options[:urn] = urn
+          @@sfa_namespaces[prefix] = options
+          @@sfa_namespace2prefix[urn] = prefix
+        end
+
+        def _sfa_prefix_for_namespace(urn)
+          @@sfa_namespace2prefix[urn]
         end
 
         def sfa_add_namespaces_to_document(doc)
           root = doc.root
           root.add_namespace(nil, SFA_NAMESPACE_URI)
-          @@sfa_namespaces.each do |name, uri|
-            root.add_namespace(name.to_s, uri) #'omf', 'http://tenderlovemaking.com')
+          @@sfa_namespaces.each do |name, opts|
+            root.add_namespace(name.to_s, opts[:urn]) #'omf', 'http://tenderlovemaking.com')
           end
         end
 
@@ -92,8 +99,8 @@ module OMF::SFA
             schema = 'ad.xsd'
           end
           root['xsi:schemaLocation'] = "#{SFA_NAMESPACE_URI} #{SFA_NAMESPACE_URI}/#{schema} #{@@sfa_namespaces[:ol]} #{@@sfa_namespaces[:ol]}/ad-reservation.xsd"
-          @@sfa_namespaces.each do |prefix, urn|
-            root.add_namespace(prefix.to_s, urn)
+          @@sfa_namespaces.each do |prefix, opts|
+            root.add_namespace(prefix.to_s, opts[:urn])
           end
 
           root.set_attribute('type', opts[:type])
@@ -107,14 +114,18 @@ module OMF::SFA
           _to_sfa_xml(resources, root, obj2id, opts)
         end
 
-        def from_sfa(resource_el, context = {})
+        def from_sfa(resource_el, context = {}, type = 'manifest')
           resource = nil
           uuid = nil
           comp_gurn = nil
 
-          unless resource_el.namespace.href == SFA_NAMESPACE_URI
-            warn "WARNING: '#{resource_el.name}' Can't handle non-default namespaces '#{resource_el.namespace.href}'"
-            return
+          unless (href = resource_el.namespace.href) == SFA_NAMESPACE_URI
+            unless prefix = _sfa_prefix_for_namespace(href)
+              warn "Ignoring unknown element '#{resource_el.name}' - NS: '#{resource_el.namespace.href}'"
+              return
+            end
+            ns_opts = @@sfa_namespaces[prefix]
+            return if ns_opts[:ignore]
           end
 
           client_id_attr = resource_el.attributes['client_id']
@@ -124,49 +135,63 @@ module OMF::SFA
             uuid = UUIDTools::UUID.parse(uuid_attr.value)
             if resource = OMF::SFA::Resource::OResource.first(:uuid => uuid)
               context[client_id] = resource if client_id
-              return resource.from_sfa(resource_el, context)
+              return resource.from_sfa(resource_el, context, type)
             end
           end
 
-          if comp_id_attr = resource_el.attributes['component_id']
+          # TODO: Clarify the role of 'sliver_id' vs. 'component_id'
+          if comp_id_attr = resource_el.attributes['sliver_id'] || resource_el.attributes['component_id']
             comp_id = comp_id_attr.value
             comp_gurn = OMF::SFA::Resource::GURN.parse(comp_id)
             #begin
             if uuid = comp_gurn.uuid
               resource = OMF::SFA::Resource::OResource.first(:uuid => uuid)
               context[client_id] = resource if client_id
-              return resource.from_sfa(resource_el, context)
+              return resource.from_sfa(resource_el, context, type)
             end
             if resource = OMF::SFA::Resource::OComponent.first(:urn => comp_gurn)
               context[client_id] = resource if client_id
-              return resource.from_sfa(resource_el, context)
+              return resource.from_sfa(resource_el, context, type)
             end
           else
             # need to create a comp_gurn (the link is an example of that)
-            unless sliver_id_attr = resource_el.attributes['sliver_id']
-              raise "Need 'sliver_id' for resource '#{resource_el}'"
-            end
-            sliver_gurn = OMF::SFA::Resource::GURN.parse(sliver_id_attr.value)
             unless client_id
               raise "Need 'client_id' for resource '#{resource_el}'"
             end
-            opts = {
-              :domain => sliver_gurn.domain,
-              :type => resource_el.name  # TODO: This most likely will break with NS
-            }
-            comp_gurn = OMF::SFA::Resource::GURN.create("#{sliver_gurn.short_name}:#{client_id}", opts)
+            if sliver_id_attr = resource_el.attributes['sliver_id']
+              sliver_gurn = OMF::SFA::Resource::GURN.parse(sliver_id_attr.value)
+              #puts "SLIVER_ID name: #{sliver_gurn.name} short: #{sliver_gurn.short_name} uuid: #{sliver_gurn.uuid}"
+            else
+              if type == 'request'
+                sliver_gurn = OMF::SFA::Resource::GURN.create(client_id, type: resource_el.name, domain: 'unknown')
+              else
+                raise "Need 'sliver_id' for resource '#{resource_el}'"
+              end
+            end
+            #puts "TYPE: #{type} - #{sliver_gurn}"
+            # opts = {
+              # :domain => sliver_gurn.domain,
+              # :type => resource_el.name  # TODO: This most likely will break with NS
+            # }
+            # comp_gurn = OMF::SFA::Resource::GURN.create("#{sliver_gurn.short_name}:#{client_id}", opts)
+            comp_gurn = sliver_gurn
             if resource = OMF::SFA::Resource::OComponent.first(:urn => comp_gurn)
               context[client_id] = resource if client_id
-              return resource.from_sfa(resource_el, context)
+              resource.from_sfa(resource_el, context, type)
+              resource.save
+              return
             end
           end
 
           # Appears the resource doesn't exist yet, let's see if we can create one
-          type = comp_gurn.type
+          type = resource_el.name #comp_gurn.type
           if res_class = @@sfa_name2class[type]
-            resource = res_class.new(:name => comp_gurn.short_name)
+            resource = res_class.new(:name => comp_gurn.short_name, :urn => comp_gurn)
+            #puts ">>> #{comp_gurn} - #{resource.to_hash}"
             context[client_id] = resource if client_id
-            return resource.from_sfa(resource_el, context)
+            resource.from_sfa(resource_el, context, type)
+            #puts "22>>> #{resource.to_hash}"
+            return
           end
           raise "Unknown resource type '#{type}' (#{@@sfa_name2class.keys.join(', ')})"
         end
@@ -490,16 +515,20 @@ module OMF::SFA
         #
         # @param context Already defined resources in this context
         #
-        def from_sfa(resource_el, context = {})
+        def from_sfa(resource_el, context = {}, type = 'manifest')
           els = {} # this doesn't work with generic namespaces
           resource_el.children.each do |el|
             next unless el.is_a? Nokogiri::XML::Element
             unless ns = el.namespace
               raise "Missing namespace declaration for '#{el}'"
             end
+            name = el.name
             unless ns.href == SFA_NAMESPACE_URI
-              warn "WARNING: '#{el.name}' Can't handle non-default namespaces '#{ns.href}'"
-              next
+              unless prefix = self.class._sfa_prefix_for_namespace(ns.href)
+                warn "#{resource_el.name}: Ignoring unknown element '#{el.name}' - NS: '#{ns.href}'"
+                next
+              end
+              name = "#{prefix}__#{name}"
             end
             (els[el.name] ||= []) << el
           end

data/lib/omf-sfa/version.rb

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

data/omf_sfa.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "erector", "~> 0.8.3"
   s.add_runtime_dependency "rack", "~> 1.3.5"
   s.add_runtime_dependency "thin", "~> 1.3.1"
+  s.add_runtime_dependency 'thin_async'
   s.add_runtime_dependency "log4r", "~> 1.1.10"
   s.add_runtime_dependency "maruku", "~> 0.6.0"
   s.add_runtime_dependency "dm-core", "~> 1.2.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_sfa
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -91,6 +91,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.1
+- !ruby/object:Gem::Dependency
+  name: thin_async
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement