nitos_testbed_rc 1.0.0.pre.4 → 1.0.0.pre.5

data/bin/cm_proxy

@@ -3,6 +3,10 @@ require 'rubygems'
 require 'omf_rc'
 require 'omf_common'
 require 'yaml'
+require "net/https"
+require "uri"
+require "json"
+require 'time'
 
 $stdout.sync = true
 
@@ -41,77 +45,129 @@ class CmPDP
   def authorize(msg, &block)
     debug "AUTH message received: #{msg.operation}"
     if msg.operation.to_sym == :configure
-      wait = true
-      result = nil
-      OmfCommon.comm.subscribe(@config[:testbedTopic]) do |am_con|
-        acc = _get_account_name(msg)
-
-        if acc.nil?
-          error "AUTH error: acc nill"
-          msg.properties.state.error_msg = "Account name not found"
-          result = msg
-          wait = false
-          next
-        end
+      acc = _get_account_name(msg)
 
-        node_name = msg.properties.state.node
-        am_con.request([:nodes]) do |n_msg|
-          nodes = n_msg.read_property("nodes")[:resources]
-          node = nil
-          nodes.each do |n|
-            if n[:resource][:name].to_s == node_name.to_s
-              node = n
-              break
-            end
-          end
-
-          lease = nil
-          if node.nil?
-            error "AUTH error: Node nill"
-            msg.properties.state.error_msg = "Wrong node name."
-            result = msg
-            wait = false
-            next
-          else
-            am_con.request([:leases]) do |l_msg|
-              leases = l_msg.read_property("leases")[:resources]
-              leases.each do |l|
-                if Time.parse(l[:resource][:valid_from]) <= Time.now && Time.parse(l[:resource][:valid_until]) >= Time.now
-                  unless l[:resource][:components].nil?
-                    l[:resource][:components].each do |c|
-                      if c[:component][:name] == node_name.to_s && l[:resource][:account][:name] == acc
-                        lease = l
-                        break #found the correct lease
-                      end
-                    end
-                  end
-                end
-              end
-
-              if lease.nil? #if lease is nil it means no matching lease is found
-                error "AUTH error: Lease nill"
-                msg.properties.state.error_msg = "Node is not leased by your account."
-                result = msg
-                wait = false
-                next
-              else
-                debug "AUTH PASSED"
-                msg.properties.state.node = node
-                result = msg
-                wait = false
-                next
-              end
-            end
-          end
-        end
+      if acc.nil?
+        error "AUTH error: Account not found"
+        msg.properties.state.error_msg = "Account name not found"
+        return msg# next
+      end
+
+      node_name = msg.properties.state.node
+      broker = @config[:broker_url]
+
+      uri = URI.parse("#{broker}/resources/nodes?name=#{node_name}")
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      request = Net::HTTP::Get.new(uri.request_uri)
+      response = http.request(request)
+      resp = JSON.parse(response.body, :symbolize_names => true)
+
+      if response.header.code != '200'
+        error "AUTH error: empty response"
+        msg.properties.state.error_msg = "#{resp[:reason]} - code: '#{resp[:exception][:code]}'"
+        return msg# next
       end
 
-      #waiting for the whole process to be completed
-      while wait
-        sleep 1
+      node = resp[:resource_response]
+      if node.nil?
+        error "AUTH error: Node '#{node_name}' not found"
+        msg.properties.state.error_msg = "Node '#{node_name}' does not exist - code: '#{resp[:exception][:code]}'"
+        return msg
       end
 
-      return result if result
+      node = node[:resources].first
+      lease = nil
+      node[:leases].each do |l|
+        l = l[:lease]
+        next if l[:account][:name] != acc
+        if Time.parse(l[:valid_from]) <= Time.now && Time.parse(l[:valid_until]) >= Time.now
+          lease = l
+          break
+        end
+      end
+
+      if lease.nil?
+        error "AUTH error: node not available"
+        msg.properties.state.error_msg = "Node '#{node_name}' is not leased by your account."
+        return msg
+      else
+        debug "AUTH PASSED"
+        msg.properties.state.node = node
+        return msg
+      end
+      # wait = true
+      # result = nil
+      # OmfCommon.comm.subscribe(@config[:testbedTopic]) do |am_con|
+      #   acc = _get_account_name(msg)
+
+      #   if acc.nil?
+      #     error "AUTH error: acc nill"
+      #     msg.properties.state.error_msg = "Account name not found"
+      #     result = msg
+      #     wait = false
+      #     next
+      #   end
+
+      #   node_name = msg.properties.state.node
+      #   am_con.request([:nodes]) do |n_msg|
+      #     nodes = n_msg.read_property("nodes")[:resources]
+      #     node = nil
+      #     nodes.each do |n|
+      #       if n[:resource][:name].to_s == node_name.to_s
+      #         node = n
+      #         break
+      #       end
+      #     end
+
+      #     lease = nil
+      #     if node.nil?
+      #       error "AUTH error: Node nill"
+      #       msg.properties.state.error_msg = "Wrong node name."
+      #       result = msg
+      #       wait = false
+      #       next
+      #     else
+      #       am_con.request([:leases]) do |l_msg|
+      #         leases = l_msg.read_property("leases")[:resources]
+      #         leases.each do |l|
+      #           if Time.parse(l[:resource][:valid_from]) <= Time.now && Time.parse(l[:resource][:valid_until]) >= Time.now
+      #             unless l[:resource][:components].nil?
+      #               l[:resource][:components].each do |c|
+      #                 if c[:component][:name] == node_name.to_s && l[:resource][:account][:name] == acc
+      #                   lease = l
+      #                   break #found the correct lease
+      #                 end
+      #               end
+      #             end
+      #           end
+      #         end
+
+      #         if lease.nil? #if lease is nil it means no matching lease is found
+      #           error "AUTH error: Lease nill"
+      #           msg.properties.state.error_msg = "Node is not leased by your account."
+      #           result = msg
+      #           wait = false
+      #           next
+      #         else
+      #           debug "AUTH PASSED"
+      #           msg.properties.state.node = node
+      #           result = msg
+      #           wait = false
+      #           next
+      #         end
+      #       end
+      #     end
+      #   end
+      # end
+
+      # #waiting for the whole process to be completed
+      # while wait
+      #   sleep 1
+      # end
+
+      # return result if result
     else
       debug "AUTH PASSED"
       return msg

data/bin/frisbee_proxy

@@ -3,6 +3,10 @@
 require 'omf_rc'
 require 'omf_common'
 require 'yaml'
+require "net/https"
+require "uri"
+require "json"
+require 'time'
 
 $stdout.sync = true
 @config = YAML.load_file('/etc/nitos_testbed_rc/frisbee_proxy_conf.yaml')
@@ -45,75 +49,127 @@ class FrisbeePDP
     debug "AUTH message received: #{msg.operation}"
     if msg.operation.to_sym == :create
       if msg.rtype.to_sym == :frisbee || msg.rtype.to_sym == :imagezip_client
-        wait = true
-        result = nil
-        OmfCommon.comm.subscribe(@config[:testbedTopic]) do |am_con|
-          acc = _get_account_name(msg)
-
-          if acc.nil?
-            error "AUTH error: acc nill"
-            msg.propertie.error_msg = "Account name not found"
-            result = msg
-            wait = false
-            next
-          end
+        acc = _get_account_name(msg)
 
-          node_name = msg.properties.node_topic
-          am_con.request([:nodes]) do |n_msg|
-            nodes = n_msg.read_property("nodes")[:resources]
-            node = nil
-            nodes.each do |n|
-              if n[:resource][:name].to_s == node_name.to_s
-                node = n
-                break
-              end
-            end
-
-            lease = nil
-            if node.nil?
-              error "AUTH error: Node nill"
-              msg.properties.error_msg = "Wrong node name."
-              result = msg
-              wait = false
-              next
-            else
-              am_con.request([:leases]) do |l_msg|
-                leases = l_msg.read_property("leases")[:resources]
-                leases.each do |l|
-                  if Time.parse(l[:resource][:valid_from]) <= Time.now && Time.parse(l[:resource][:valid_until]) >= Time.now
-                    l[:resource][:components].each do |c|
-                      if c[:component][:name] == node_name.to_s && l[:resource][:account][:name] == acc
-                        lease = l
-                        break #found the correct lease
-                      end
-                    end
-                  end
-                end
-
-                if lease.nil? #if lease is nil it means no matching lease is found
-                  error "AUTH error: Lease nill"
-                  msg.properties.error_msg = "Node is not leased by your account."
-                  result = msg
-                  wait = false
-                  next
-                else
-                  debug "AUTH PASSED"
-                  msg.properties.node = node
-                  result = msg
-                  wait = false
-                  next
-                end
-              end
-            end
-          end
+        if acc.nil?
+          error "AUTH error: Account not found"
+          msg.properties.state.error_msg = "Account name not found"
+          return msg# next
+        end
+
+        node_name = msg.properties.node_topic
+        broker = @config[:broker_url]
+
+        uri = URI.parse("#{broker}/resources/nodes?name=#{node_name}")
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        request = Net::HTTP::Get.new(uri.request_uri)
+        response = http.request(request)
+        resp = JSON.parse(response.body, :symbolize_names => true)
+
+        if response.header.code != '200'
+          error "AUTH error: empty response"
+          msg.properties.state.error_msg = "#{resp[:reason]} - code: '#{resp[:exception][:code]}'"
+          return msg# next
         end
 
-        #waiting for the whole process to be completed
-        while wait
-          sleep 1
+        node = resp[:resource_response]
+        if node.nil?
+          error "AUTH error: Node not found"
+          msg.properties.state.error_msg = "#{resp[:reason]} - code: '#{resp[:exception][:code]}'"
+          return msg
         end
 
-        return result if result
+        node = node[:resources].first
+        lease = nil
+        node[:leases].each do |l|
+          l = l[:lease]
+          next if l[:account][:name] != acc
+          if Time.parse(l[:valid_from]) <= Time.now && Time.parse(l[:valid_until]) >= Time.now
+            lease = l
+            break
+          end
+        end
+
+        if lease.nil?
+          error "AUTH error: node not available"
+          msg.properties.error_msg = "Node is not leased by your account."
+          return msg
+        else
+          debug "AUTH PASSED"
+          msg.properties.node = node
+          return msg
+        end
+        # wait = true
+        # result = nil
+        # OmfCommon.comm.subscribe(@config[:testbedTopic]) do |am_con|
+        #   acc = _get_account_name(msg)
+
+        #   if acc.nil?
+        #     error "AUTH error: acc nill"
+        #     msg.propertie.error_msg = "Account name not found"
+        #     result = msg
+        #     wait = false
+        #     next
+        #   end
+
+        #   node_name = msg.properties.node_topic
+        #   am_con.request([:nodes]) do |n_msg|
+        #     nodes = n_msg.read_property("nodes")[:resources]
+        #     node = nil
+        #     nodes.each do |n|
+        #       if n[:resource][:name].to_s == node_name.to_s
+        #         node = n
+        #         break
+        #       end
+        #     end
+
+        #     lease = nil
+        #     if node.nil?
+        #       error "AUTH error: Node nill"
+        #       msg.properties.error_msg = "Wrong node name."
+        #       result = msg
+        #       wait = false
+        #       next
+        #     else
+        #       am_con.request([:leases]) do |l_msg|
+        #         leases = l_msg.read_property("leases")[:resources]
+        #         leases.each do |l|
+        #           if Time.parse(l[:resource][:valid_from]) <= Time.now && Time.parse(l[:resource][:valid_until]) >= Time.now
+        #             l[:resource][:components].each do |c|
+        #               if c[:component][:name] == node_name.to_s && l[:resource][:account][:name] == acc
+        #                 lease = l
+        #                 break #found the correct lease
+        #               end
+        #             end
+        #           end
+        #         end
+
+        #         if lease.nil? #if lease is nil it means no matching lease is found
+        #           error "AUTH error: Lease nill"
+        #           msg.properties.error_msg = "Node is not leased by your account."
+        #           result = msg
+        #           wait = false
+        #           next
+        #         else
+        #           debug "AUTH PASSED"
+        #           msg.properties.node = node
+        #           result = msg
+        #           wait = false
+        #           next
+        #         end
+        #       end
+        #     end
+        #   end
+        # end
+
+        # #waiting for the whole process to be completed
+        # while wait
+        #   sleep 1
+        # end
+
+        # return result if result
       else
         debug "AUTH PASSED"
         return msg

data/bin/install_ntrc

@@ -18,17 +18,19 @@ unless File.directory?(log_path)
   FileUtils.mkdir_p(log_path)
 end
 
+puts "Installing configuration files."
 conf_files = []
 conf_files << "cm_proxy_conf.yaml"
 conf_files << "frisbee_proxy_conf.yaml"
 conf_files << "user_proxy_conf.yaml"
-# conf_files << "omf_script_conf.yaml"
+conf_files << "omf_script_conf.yaml"
 
 conf_files.each do |file|
   puts "Copying configuration file '#{gem_root}/etc/#{file}' to '#{config_path}'."
   FileUtils.cp "#{gem_root}/etc/#{file}", "#{config_path}/#{file}"
   FileUtils.chmod 0644, "#{config_path}/#{file}"
 end
+puts "All configuration files have been installed, browse folder '#{config_path}' to alternate them appropriatly."
 
 config_path = File.expand_path("~/.omf/etc")
 unless File.directory?(config_path)