nitos_testbed_rc 1.0.0.pre.11 → 1.0.0.pre.12

data/README.md

@@ -39,7 +39,7 @@ Then you need to run the install_ntrc script to generate the configuration files
 Create certificates
 -------------------
 
-Use omf_cert.rb script to generate the following certificates and place them on directories '/root/.omf' and /root/.omf.
+Use omf_cert.rb script to generate the following certificates and place them on directories '/root/.omf' and '/root/.omf/trusted_roots'.
 
     $ mkdir /root/.omf
     $ mkdir /root/.omf/trusted_roots

data/bin/cm_proxy

@@ -84,15 +84,27 @@ class CmPDP
 
       node = node[:resources].first
 
-      if @config[:testbedDomain] != "ALL" && node[:domain] != @config[:testbedDomain] 
-        debug "This node does not belong to the domain '#{@config[:testbedDomain]}'"
-        msg.properties.state.ignore_msg = true
-        return msg
-      end
+      # if @config[:testbedDomain] != "ALL" && node[:domain] != @config[:testbedDomain] 
+      #   debug "This node does not belong to the domain '#{@config[:testbedDomain]}'"
+      #   msg.properties.state.ignore_msg = true
+      #   return msg
+      # end
 
+      nod = {}
+      nod[:node_name] = node[:name]
+      node[:interfaces].each do |i|
+        if i[:role] == "control"
+          nod[:node_ip] = i[:ip][:address]
+          nod[:node_mac] = i[:mac]
+        elsif i[:role] == "cm_network"
+          nod[:node_cm_ip] = i[:ip][:address]
+        end
+      end
+      nod[:node_cm_ip] = node[:cmc][:ip][:address]
+      
       if acc == 'root'
         debug "AUTH PASSED (root account)"
-        msg.properties.state.node = node
+        msg.properties.state.node = nod
         return msg
       end
 
@@ -115,7 +127,7 @@ class CmPDP
         return msg
       else
         debug "AUTH PASSED"
-        msg.properties.state.node = node
+        msg.properties.state.node = nod
         return msg
       end
       # wait = true

data/bin/frisbee_proxy

@@ -88,15 +88,27 @@ class FrisbeePDP
 
         node = node[:resources].first
 
-        if @config[:testbedDomain] != "ALL" && node[:domain] != @config[:testbedDomain] 
-          debug "This node does not belong to the domain '#{@config[:testbedDomain]}'"
-          msg.properties.state.ignore_msg = true
-          return msg
+        # if @config[:testbedDomain] != "ALL" && node[:domain] != @config[:testbedDomain] 
+        #   debug "This node does not belong to the domain '#{@config[:testbedDomain]}'"
+        #   msg.properties.state.ignore_msg = true
+        #   return msg
+        # end
+
+        nod = {}
+        nod[:node_name] = node[:name]
+        node[:interfaces].each do |i|
+          if i[:role] == "control"
+            nod[:node_ip] = i[:ip][:address]
+            nod[:node_mac] = i[:mac]
+          elsif i[:role] == "cm_network"
+            nod[:node_cm_ip] = i[:ip][:address]
+          end
         end
+        nod[:node_cm_ip] = node[:cmc][:ip][:address]
 
         if acc == 'root'
           debug "AUTH PASSED (root account)"
-          msg.properties.node = node
+          msg.properties.node = nod
           return msg
         end
 
@@ -118,7 +130,7 @@ class FrisbeePDP
           return msg
         else
           debug "AUTH PASSED"
-          msg.properties.node = node
+          msg.properties.node = nod
           return msg
         end
         # wait = true
@@ -199,7 +211,6 @@ class FrisbeePDP
       debug "AUTH PASSED"
       return msg
     end
-#     msg
   end
 
   private

data/bin/omf6

@@ -4,11 +4,16 @@ require 'time'
 require 'omf_common'
 require 'optparse'
 require 'progress_bar'
+require 'erb'
+require 'socket'
+
 CONF_PATH = '~/.omf/etc/omf_script_conf.yaml'
 FRISB_PATH = '/etc/nitos_testbed_rc/frisbee_proxy_conf.yaml'
 CM_PATH = '/etc/nitos_testbed_rc/cm_proxy_conf.yaml'
 
-@config = YAML.load_file(File.expand_path(CONF_PATH))
+conf_file = File.read(File.expand_path(CONF_PATH))
+conf_file = ERB.new(conf_file, nil).result(binding)
+@config = YAML.load(conf_file)
 # @config = YAML.load_file(File.join(File.dirname(File.expand_path(__FILE__)), '.../etc/omf_script_conf.yaml'))
 @auth = @config[:auth]
 @xmpp = @config[:xmpp]
@@ -501,7 +506,7 @@ def save(comm, options)
                     start_saving()
                     puts "INFO: Starting Imagezip Server on port '#{port}'"
                     create_imagezip_server(comm, fcontroller, port, options)
-                    sleep 2
+                    sleep 1
                     puts "INFO: Starting Imagezip Client on node '#{options[:node]}'"
                     create_imagezip_client(comm, fcontroller, options[:node], port, options)
                     print "INFO: Saving Image for node '#{options[:node]}'..."

data/etc/omf_script_conf.yaml

@@ -1,9 +1,9 @@
 :xmpp:
   :script_user: script_user
   :password: pw
-  :server: testserver
+  :server: <% Socket.gethostname %>.inf.uth.gr
 :auth:
-  :root_cert_dir: ~/.omf/trusted_roots
+  :root_cert_dir: /etc/nitos_testbed_rc/trusted_roots
   :entity_cert: ~/.omf/user_cert.pem
   :entity_key: ~/.ssh/id_rsa
 #operation mode for OmfCommon.init (development, production, etc)

data/lib/nitos_testbed_rc/cm_factory.rb

@@ -28,21 +28,22 @@ module OmfRc::ResourceProxy::CMFactory
       }, :ALL)
       next
     end
-    if value.ignore_msg
-      #just ignore this message, another resource controller should take care of this message
-      next
-    end
-    nod = {}
-    nod[:node_name] = value.node[:name]
-    value.node[:interfaces].each do |i|
-      if i[:role] == "control"
-        nod[:node_ip] = i[:ip][:address]
-        nod[:node_mac] = i[:mac]
-      elsif i[:role] == "cm_network"
-        nod[:node_cm_ip] = i[:ip][:address]
-      end
-    end
-    nod[:node_cm_ip] = value.node[:cmc][:ip][:address]
+    # if value.ignore_msg
+    #   #just ignore this message, another resource controller should take care of this message
+    #   next
+    # end
+    # nod = {}
+    # nod[:node_name] = value.node[:name]
+    # value.node[:interfaces].each do |i|
+    #   if i[:role] == "control"
+    #     nod[:node_ip] = i[:ip][:address]
+    #     nod[:node_mac] = i[:mac]
+    #   elsif i[:role] == "cm_network"
+    #     nod[:node_cm_ip] = i[:ip][:address]
+    #   end
+    # end
+    # nod[:node_cm_ip] = value.node[:cmc][:ip][:address]
+    nod = value.node
 #     nod = {node_name: "node1", node_ip: "10.0.0.1", node_mac: "00-03-1d-0d-4b-96", node_cm_ip: "10.0.0.101"}
 
     case value[:status].to_sym

data/lib/nitos_testbed_rc/frisbee.rb

@@ -39,20 +39,21 @@ module OmfRc::ResourceProxy::Frisbee #frisbee client
         }, :ALL)
         next
       end
-      if client.opts.ignore_msg
-        #just ignore this message, another resource controller should take care of this message
-        next
-      end
-      nod = {}
-      nod[:node_name] = client.opts.node.name
-      client.opts.node.interfaces.each do |i|
-        if i[:role] == "control"
-          nod[:node_ip] = i[:ip][:address]
-          nod[:node_mac] = i[:mac]
-        end
-      end
-      nod[:node_cm_ip] = client.opts.node.cmc.ip.address
+      # if client.opts.ignore_msg
+      #   #just ignore this message, another resource controller should take care of this message
+      #   next
+      # end
+      # nod = {}
+      # nod[:node_name] = client.opts.node.name
+      # client.opts.node.interfaces.each do |i|
+      #   if i[:role] == "control"
+      #     nod[:node_ip] = i[:ip][:address]
+      #     nod[:node_mac] = i[:mac]
+      #   end
+      # end
+      # nod[:node_cm_ip] = client.opts.node.cmc.ip.address
       #nod = {node_name: "node1", node_ip: "10.0.0.1", node_mac: "00-03-1d-0d-4b-96", node_cm_ip: "10.0.0.101"}
+      nod = client.opts.node
       client.property.multicast_interface = nod[:node_ip]
       client.property.app_id = client.hrn.nil? ? client.uid : client.hrn
 

data/lib/nitos_testbed_rc/frisbeed.rb

@@ -29,13 +29,13 @@ module OmfRc::ResourceProxy::Frisbeed
 
   hook :after_initial_configured do |server|
     debug "Received message '#{server.opts.inspect}'"
-    if error_msg = server.opts.error_msg
-      next
-    end
-    if server.opts.ignore_msg
-      #just ignore this message, another resource controller should take care of this message
-      next
-    end
+    # if error_msg = server.opts.error_msg
+    #   next
+    # end
+    # if server.opts.ignore_msg
+    #   #just ignore this message, another resource controller should take care of this message
+    #   next
+    # end
     server.property.app_id = server.hrn.nil? ? server.uid : server.hrn
     server.property.image = server.property.image.nil? ? @fconf[:imageDir] + '/' + @fconf[:defaultImage] : server.property.image
     server.property.image = server.property.image.start_with?('/') ? server.property.image : @fconf[:imageDir] + '/' + server.property.image

data/lib/nitos_testbed_rc/imagezip_client.rb

@@ -38,31 +38,35 @@ module OmfRc::ResourceProxy::ImagezipClient #Imagezip client
         }, :ALL)
         next
       end
-      if client.opts.ignore_msg
-        #just ignore this message, another resource controller should take care of this message
-        next
-      end
+      # if client.opts.ignore_msg
+      #   #just ignore this message, another resource controller should take care of this message
+      #   next
+      # end
 
-      nod = {}
-      nod[:node_name] = client.opts.node.name
-      client.opts.node.interfaces.each do |i|
-        if i[:role] == "control"
-          nod[:node_ip] = i[:ip][:address]
-          nod[:node_mac] = i[:mac]
-        elsif i[:role] == "cm_network"
-          nod[:node_cm_ip] = i[:ip][:address]
-        end
-      end
-      nod[:node_cm_ip] = client.opts.node.cmc.ip.address
+      # nod = {}
+      # nod[:node_name] = client.opts.node.name
+      # client.opts.node.interfaces.each do |i|
+      #   if i[:role] == "control"
+      #     nod[:node_ip] = i[:ip][:address]
+      #     nod[:node_mac] = i[:mac]
+      #   elsif i[:role] == "cm_network"
+      #     nod[:node_cm_ip] = i[:ip][:address]
+      #   end
+      # end
+      # nod[:node_cm_ip] = client.opts.node.cmc.ip.address
 
+      nod = client.opts.node
       client.property.app_id = client.hrn.nil? ? client.uid : client.hrn
 
-      command = "#{client.property.binary_path} -o -z1 #{client.property.hardrive} - | #{@fconf[:imagezipClientNC]} -q 0 #{client.property.ip} #{client.property.port}"
-      debug "Executing command #{command}"
-  #     nod = {node_name: "node1", node_ip: "10.0.0.1", node_mac: "00-03-1d-0d-4b-96", node_cm_ip: "10.0.0.101"}
+      command = "#{client.property.binary_path} -o -z1 -d #{client.property.hardrive} - | #{@fconf[:imagezipClientNC]} -q 0 #{client.property.ip} #{client.property.port}"
+      #     nod = {node_name: "node1", node_ip: "10.0.0.1", node_mac: "00-03-1d-0d-4b-96", node_cm_ip: "10.0.0.101"}
       summary = ''
+      debug "Telnet on: '#{nod[:node_ip]}'"
       host = Net::Telnet.new("Host" => nod[:node_ip], "Timeout" => false)#, "Prompt" => /[\w().-]*[\$#>:.]\s?(?:\(enable\))?\s*$/)
+      debug "Telnet successfull"
+      debug "Executing command #{command.to_s}"
       host.cmd(command.to_s) do |c|
+        print "#{c}"
         # if c.to_s !=  "\n" && c[0,5] != "\n/usr" && c.to_s != "." && c.to_s != ".." && c.to_s != "..."
           # puts '---------(' + c.to_s + ')-----------'
         if c.include? 'compressed'
@@ -76,6 +80,7 @@ module OmfRc::ResourceProxy::ImagezipClient #Imagezip client
           # }, :ALL)
         end
       end
+      debug "imagezip client finished"
 
       client.inform(:status, {
         status_type: 'IMAGEZIP',

data/lib/nitos_testbed_rc/imagezip_server.rb

@@ -25,13 +25,13 @@ module OmfRc::ResourceProxy::ImagezipServer #Imagezip server
 
   hook :after_initial_configured do |server|
     debug "Received message '#{server.opts.inspect}'"
-    if error_msg = server.opts.error_msg
-      next
-    end
-    if server.opts.ignore_msg
-      #just ignore this message, another resource controller should take care of this message
-      next
-    end
+    # if error_msg = server.opts.error_msg
+    #   next
+    # end
+    # if server.opts.ignore_msg
+    #   #just ignore this message, another resource controller should take care of this message
+    #   next
+    # end
     server.property.app_id = server.hrn.nil? ? server.uid : server.hrn
     server.property.image_name = server.property.image_name.nil? ? @fconf[:imageDir] + '/' + @fconf[:defaultImage] : server.property.image_name
     server.property.image_name = server.property.image_name.start_with?('/') ? server.property.image_name : @fconf[:imageDir] + '/' + server.property.image_name

data/lib/version.rb

@@ -1,5 +1,5 @@
 module NITOS
   module TestbedRc
-    VERSION = "1.0.0.pre.11"
+    VERSION = "1.0.0.pre.12"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nitos_testbed_rc
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.11
+  version: 1.0.0.pre.12
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omf_common