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

data/etc/cm_proxy_conf.yaml

@@ -9,9 +9,14 @@
   :entity_cert: /root/.omf/cm_factory.pem
   :entity_key: /root/.omf/cm_factory.pkey
 
+# URL for the rest interface of the broker
+:broker_url: https://nitlab.inf.uth.gr:8001 
+
 #time (in seconds) before timeout error occurs
 :timeout: 80
+
 #operation mode for OmfCommon.init (development, production, etc)
 :operationMode: development
+
 #testbed xmpp topic
 :testbedTopic: am_controller

data/etc/frisbee_proxy_conf.yaml

@@ -9,6 +9,9 @@
   :entity_cert: /root/.omf/frisbee_factory.pem
   :entity_key: /root/.omf/frisbee_factory.pkey
 
+# URL for the rest interface of the broker
+:broker_url: https://nitlab.inf.uth.gr:8001 
+
 #operation Mode for OmfCommon.init (development, production, etc)
 :operationMode: development
 

data/lib/nitos_testbed_rc/cm_factory.rb

@@ -29,8 +29,8 @@ module OmfRc::ResourceProxy::CMFactory
       next
     end
     nod = {}
-    nod[:node_name] = value.node[:resource][:name]
-    value.node[:resource][:interfaces].each do |i|
+    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]
@@ -38,7 +38,7 @@ module OmfRc::ResourceProxy::CMFactory
         nod[:node_cm_ip] = i[:ip][:address]
       end
     end
-    nod[:node_cm_ip] = value.node[:resource][:cmc][:ip][:address]
+    nod[:node_cm_ip] = value.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"}
 
     case value[:status].to_sym
@@ -53,65 +53,6 @@ module OmfRc::ResourceProxy::CMFactory
     end
   end
 
-  work("wait_until_ping") do |res, ip|
-    t = 0
-    resp = false
-    loop do
-      sleep 2
-      status = system("ping #{ip} -c 2 -w 2")
-      if t < @timeout
-        if status == true
-          resp = true
-          break
-        end
-      else
-        resp = false
-        break
-      end
-      t += 2
-    end
-    resp
-  end
-
-  work("wait_until_no_ping") do |res, ip|
-    t = 0
-    resp = false
-    loop do
-      sleep 2
-      status = system("ping #{ip} -c 2 -w 2")
-      if t < @timeout
-        if status == false
-          resp = true
-          break
-        end
-      else
-        resp = false
-        break
-      end
-      t += 2
-    end
-    resp
-  end
-
-  #this is used by other methods in this scope
-  work("get_status") do |res, node|
-    debug "http://#{node[:node_cm_ip].to_s}/state"
-    doc = Nokogiri::XML(open("http://#{node[:node_cm_ip].to_s}/state"))
-    resp = doc.xpath("//Response//line//value").text.strip
-    debug "state response: #{resp}"
-
-    if resp == 'on'
-      symlink_name = "/tftpboot/pxelinux.cfg/01-#{node[:node_mac]}"
-      if File.exists?("#{symlink_name}")
-        :on_pxe
-      else
-        :on
-      end
-    elsif resp == 'off'
-      :off
-    end
-  end
-
   #this is used by the get status call
   work("status") do |res, node|
     debug "Status url: http://#{node[:node_cm_ip].to_s}/state"
@@ -127,14 +68,22 @@ module OmfRc::ResourceProxy::CMFactory
       next
     end
 
+    ans = doc.xpath("//Response//line//value").text
+    ans.strip!
+
     res.inform(:status, {
-      current: "#{doc.xpath("//Response//line//value").text}",
+      current: "#{ans}",
       node_name: "#{node[:node_name].to_s}"
     }, :ALL)
     sleep 1 #this solves the getting stuck problem.
   end
 
   work("start_node") do |res, node, wait|
+    node[:node_mac] = node[:node_mac].downcase.gsub(/:/, '-')
+    symlink_name = "/tftpboot/pxelinux.cfg/01-#{node[:node_mac]}"
+    if File.exists?(symlink_name)
+      File.delete(symlink_name)
+    end
     debug "Start_node url: http://#{node[:node_cm_ip].to_s}/on"
     begin
       doc = Nokogiri::XML(open("http://#{node[:node_cm_ip].to_s}/on"))
@@ -143,17 +92,26 @@ module OmfRc::ResourceProxy::CMFactory
         event_type: "HTTP",
         exit_code: "-1",
         node_name: "#{node[:node_name].to_s}",
-        msg: "failed to reach cm, ip: #{node[:node_cm_ip].to_s}."
+        msg: "#{node[:name]} failed to reach cm, ip: #{node[:node_cm_ip].to_s}."
       }, :ALL)
       next
     end
 
-    if doc.xpath("//Response").text == 'ok'
+    ans = doc.xpath("//Response").text
+    ans.strip!
+
+    if ans == 'ok'
       res.inform(:status, {
         node_name: "#{node[:node_name].to_s}",
         current: :booting,
         desired: :running
       }, :ALL)
+    elsif ans == 'already on'
+      res.inform(:status, {
+        node_name: "#{node[:node_name].to_s}",
+        current: :running,
+        desired: :running
+      }, :ALL)
     end
 
     if wait
@@ -176,6 +134,11 @@ module OmfRc::ResourceProxy::CMFactory
   end
 
   work("stop_node") do |res, node, wait|
+    node[:node_mac] = node[:node_mac].downcase.gsub(/:/, '-')
+    symlink_name = "/tftpboot/pxelinux.cfg/01-#{node[:node_mac]}"
+    if File.exists?(symlink_name)
+      File.delete(symlink_name)
+    end
     begin
       debug "Shutting down node '#{node[:node_name]}' through ssh."
       ssh = Net::SSH.start(node[:node_ip], 'root')#, :password => @password)
@@ -192,12 +155,22 @@ module OmfRc::ResourceProxy::CMFactory
         debug "ssh failed, using CM card instead."
         debug "Stop_node url: http://#{node[:node_cm_ip].to_s}/off"
         doc = Nokogiri::XML(open("http://#{node[:node_cm_ip].to_s}/off"))
-        if doc.xpath("//Response").text == 'ok'
+
+        ans = doc.xpath("//Response").text
+        ans.strip!
+
+        if ans == 'ok'
           res.inform(:status, {
               node_name: "#{node[:node_name].to_s}",
               current: :running,
               desired: :stopped
           }, :ALL)
+        elsif ans == 'already off'
+          res.inform(:status, {
+              node_name: "#{node[:node_name].to_s}",
+              current: :stopped,
+              desired: :stopped
+          }, :ALL)
         end
       rescue
         res.inform(:error, {
@@ -230,6 +203,11 @@ module OmfRc::ResourceProxy::CMFactory
   end
 
   work("reset_node") do |res, node, wait|
+    node[:node_mac] = node[:node_mac].downcase.gsub(/:/, '-')
+    symlink_name = "/tftpboot/pxelinux.cfg/01-#{node[:node_mac]}"
+    if File.exists?(symlink_name)
+      File.delete(symlink_name)
+    end
     begin
       debug "Rebooting node '#{node[:node_name]}' through ssh."
       ssh = Net::SSH.start(node[:node_ip], 'root')#, :password => @password)
@@ -249,7 +227,7 @@ module OmfRc::ResourceProxy::CMFactory
         if doc.xpath("//Response").text == 'ok'
           res.inform(:status, {
               node_name: "#{node[:node_name].to_s}",
-              current: :running,
+              current: :resetted,
               desired: :resetted
           }, :ALL)
         end
@@ -285,6 +263,7 @@ module OmfRc::ResourceProxy::CMFactory
 
   work("start_node_pxe") do |res, node|
     resp = res.get_status(node)
+    node[:node_mac] = node[:node_mac].downcase.gsub(/:/, '-')
     if resp == :on
       symlink_name = "/tftpboot/pxelinux.cfg/01-#{node[:node_mac]}"
       if !File.exists?("#{symlink_name}")
@@ -341,6 +320,11 @@ module OmfRc::ResourceProxy::CMFactory
         desired: :pxe_on
       }, :ALL)
     else
+      node[:node_mac] = node[:node_mac].downcase.gsub(/:/, '-')
+      symlink_name = "/tftpboot/pxelinux.cfg/01-#{node[:node_mac]}"
+      if File.exists?(symlink_name)
+        File.delete(symlink_name)
+      end
       res.inform(:error, {
         event_type: "TIME_OUT",
         exit_code: "-1",
@@ -352,6 +336,7 @@ module OmfRc::ResourceProxy::CMFactory
   end
 
   work("start_node_pxe_off") do |res, node, action|
+    node[:node_mac] = node[:node_mac].downcase.gsub(/:/, '-')
     symlink_name = "/tftpboot/pxelinux.cfg/01-#{node[:node_mac]}"
     if File.exists?(symlink_name)
       File.delete(symlink_name)
@@ -416,4 +401,65 @@ module OmfRc::ResourceProxy::CMFactory
     end
     sleep 1
   end
+
+  #this is used by other methods in this scope
+  work("wait_until_ping") do |res, ip|
+    t = 0
+    resp = false
+    loop do
+      sleep 2
+      status = system("ping #{ip} -c 2 -w 2")
+      if t < @timeout
+        if status == true
+          resp = true
+          break
+        end
+      else
+        resp = false
+        break
+      end
+      t += 2
+    end
+    resp
+  end
+
+  #this is used by other methods in this scope
+  work("wait_until_no_ping") do |res, ip|
+    t = 0
+    resp = false
+    loop do
+      sleep 2
+      status = system("ping #{ip} -c 2 -w 2")
+      if t < @timeout
+        if status == false
+          resp = true
+          break
+        end
+      else
+        resp = false
+        break
+      end
+      t += 2
+    end
+    resp
+  end
+
+  #this is used by other methods in this scope
+  work("get_status") do |res, node|
+    debug "http://#{node[:node_cm_ip].to_s}/state"
+    doc = Nokogiri::XML(open("http://#{node[:node_cm_ip].to_s}/state"))
+    resp = doc.xpath("//Response//line//value").text.strip
+    debug "state response: #{resp}"
+
+    if resp == 'on'
+      symlink_name = "/tftpboot/pxelinux.cfg/01-#{node[:node_mac]}"
+      if File.exists?("#{symlink_name}")
+        :on_pxe
+      else
+        :on
+      end
+    elsif resp == 'off'
+      :off
+    end
+  end
 end

data/lib/nitos_testbed_rc/frisbee.rb

@@ -40,14 +40,14 @@ module OmfRc::ResourceProxy::Frisbee #frisbee client
         next
       end
       nod = {}
-      nod[:node_name] = client.opts.node.resource.name
-      client.opts.node.resource.interfaces.each do |i|
+      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.resource.cmc.ip.address
+      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"}
       client.property.multicast_interface = nod[:node_ip]
       client.property.app_id = client.hrn.nil? ? client.uid : client.hrn
@@ -55,10 +55,11 @@ module OmfRc::ResourceProxy::Frisbee #frisbee client
       command = "#{client.property.binary_path} -i #{client.property.multicast_interface} -m #{client.property.multicast_address} -p #{client.property.port} #{client.property.hardrive}"
       debug "Executing command #{command}"
 
+      output = ''
       host = Net::Telnet.new("Host" => client.property.multicast_interface.to_s, "Timeout" => 200, "Prompt" => /[\w().-]*[\$#>:.]\s?(?:\(enable\))?\s*$/)
       host.cmd(command.to_s) do |c|
-        if c !=  "\n" && (c[0,8] == "Progress" || c[0,5] == "Wrote")
-          c = c.sub("\n","\n#{client.property.node_topic}: ")
+        if c[0,8] ==  "Progress"
+          c = c.split[1]
           client.inform(:status, {
             status_type: 'FRISBEE',
             event: "STDOUT",
@@ -66,6 +67,12 @@ module OmfRc::ResourceProxy::Frisbee #frisbee client
             node: client.property.node_topic,
             msg: "#{c.to_s}"
           }, :ALL)
+        elsif c[0,5] == "Wrote"
+          c = c.split("\n")
+          output = "#{c.first}\n#{c.last}"
+        elsif c[0,6] == "\nWrote"
+          c = c.split("\n")
+          output = "#{c[1]}\n#{c.last}"
         end
       end
 
@@ -74,7 +81,7 @@ module OmfRc::ResourceProxy::Frisbee #frisbee client
         event: "EXIT",
         app: client.property.app_id,
         node: client.property.node_topic,
-        msg: 'frisbee client completed.'
+        msg: output
       }, :ALL)
       host.close
     end

data/lib/nitos_testbed_rc/imagezip_client.rb

@@ -40,8 +40,8 @@ module OmfRc::ResourceProxy::ImagezipClient #Imagezip client
       end
 
       nod = {}
-      nod[:node_name] = client.opts.node.resource.name
-      client.opts.node.resource.interfaces.each do |i|
+      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]
@@ -49,25 +49,27 @@ module OmfRc::ResourceProxy::ImagezipClient #Imagezip client
           nod[:node_cm_ip] = i[:ip][:address]
         end
       end
-      nod[:node_cm_ip] = client.opts.node.resource.cmc.ip.address
+      nod[:node_cm_ip] = client.opts.node.cmc.ip.address
 
       client.property.app_id = client.hrn.nil? ? client.uid : client.hrn
 
       command = "#{client.property.binary_path} -o -z1 #{client.property.hardrive} - | /bin/nc -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"}
-
+      summary = ''
       host = Net::Telnet.new("Host" => nod[:node_ip], "Timeout" => false)#, "Prompt" => /[\w().-]*[\$#>:.]\s?(?:\(enable\))?\s*$/)
       host.cmd(command.to_s) do |c|
-        if c.to_s !=  "\n" && c[0,5] != "\n/usr" && c.to_s != "." && c.to_s != ".." && c.to_s != "..."
-          #puts '__' + c.to_s + '__'
-          client.inform(:status, {
-            status_type: 'IMAGEZIP',
-            event: "STDOUT",
-            app: client.property.app_id,
-            node: client.property.node_topic,
-            msg: "#{c.to_s}"
-          }, :ALL)
+        # 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'
+          summary = c
+          # client.inform(:status, {
+          #   status_type: 'IMAGEZIP',
+          #   event: "STDOUT",
+          #   app: client.property.app_id,
+          #   node: client.property.node_topic,
+          #   msg: "#{c.to_s}"
+          # }, :ALL)
         end
       end
 
@@ -76,7 +78,7 @@ module OmfRc::ResourceProxy::ImagezipClient #Imagezip client
         event: "EXIT",
         app: client.property.app_id,
         node: client.property.node_topic,
-        msg: 'imagezip client completed.'
+        msg: summary
       }, :ALL)
       host.close
     end

data/lib/nitos_testbed_rc/imagezip_server.rb

@@ -25,6 +25,8 @@ module OmfRc::ResourceProxy::ImagezipServer #Imagezip server
 
   hook :after_initial_configured do |server|
     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
 
     @app = ExecApp.new(server.property.app_id, server.build_command_line, server.property.map_err_to_out) do |event_type, app_id, msg|
       server.process_event(server, event_type, app_id, msg)
@@ -36,10 +38,10 @@ module OmfRc::ResourceProxy::ImagezipServer #Imagezip server
   end
 
   def process_event(res, event_type, app_id, msg)
-      logger.info "Frisbeed: App Event from '#{app_id}' - #{event_type}: '#{msg}'"
+      logger.info "ImagezipServer: App Event from '#{app_id}' - #{event_type}: '#{msg}'"
       if event_type == 'EXIT' #maybe i should inform you for every event_type, we'll see.
         res.inform(:status, {
-          status_type: 'IMAGEZIP',
+          status_type: 'IMAGEZIP_SERVER',
           event: event_type.to_s.upcase,
           app: app_id,
           exit_code: msg,
@@ -47,7 +49,7 @@ module OmfRc::ResourceProxy::ImagezipServer #Imagezip server
         }, :ALL)
       elsif event_type == 'STDOUT'
         res.inform(:status, {
-          status_type: 'IMAGEZIP',
+          status_type: 'IMAGEZIP_SERVER',
           event: event_type.to_s.upcase,
           app: app_id,
           exit_code: msg,

data/lib/nitos_testbed_rc/user.rb

@@ -23,11 +23,29 @@ module OmfRc::ResourceProxy::User
       FileUtils.mkdir_p(path)
     end
 
-    File.write("#{path}/cert.pem", value)
+    File.write("#{path}/user_cert.pem", value)
+
+    path = "/home/#{res.property.username}/.omf/etc"
+    unless File.directory?(path)#create the directory if it doesn't exist (it will never exist)
+      FileUtils.mkdir_p(path)
+    end
+
+    conf_file = File.read('/etc/nitos_testbed_rc/omf_script_conf.yaml')
+    conf_file.sub!(' script_user', " #{res.property.username}")
+    conf_file.sub!(' testserver', " #{res.topics.first.address.split('@').last}")
+
+    File.write("#{path}/omf_script_conf.yaml", conf_file)
+
+    cmd = "chown -R #{res.property.username}:#{res.property.username} /home/#{res.property.username}"
+    system(cmd)
   end
 
   configure :auth_keys do |res, value|
-    File.open("/home/#{res.property.username}/.ssh/authorized_keys", 'w') do |file|
+    path = "/home/#{res.property.username}/.ssh"
+    unless File.directory?(path)#create the directory if it doesn't exist (it will never exist)
+      FileUtils.mkdir_p(path)
+    end
+    File.open("#{path}/authorized_keys", 'w') do |file|
       value.each do |v|
         file.puts v
       end
@@ -44,6 +62,73 @@ module OmfRc::ResourceProxy::User
     ExecApp.new(user.property.app_id, user.build_command_line, user.property.map_err_to_out) do |event_type, app_id, msg|
       user.process_event(user, event_type, app_id, msg)
     end
+
+    # user.add_user
+
+  end
+
+  work('add_user') do |user|
+    cmd = "#{user.property.binary_path} -d /home/#{user.property.username} -s /bin/bash #{user.property.username}"
+    puts "exec command: #{cmd}"
+    # result = system(cmd)
+    out = IO.popen(cmd)
+    result = true
+    if result
+      key = OpenSSL::PKey::RSA.new(2048)
+      pub_key = key.public_key
+      path = "/home/#{user.property.username}/.ssh/"
+      unless File.directory?(path)#create the directory if it doesn't exist (it will never exist)
+        FileUtils.mkdir_p(path)
+      end
+      File.write("#{path}/pub_key.pem", pub_key.to_pem)
+      File.write("#{path}/key.pem", key.to_pem)
+      sleep 1
+      user.inform(:status, {
+        status_type: 'APP_EVENT',
+        event: 'EXIT',
+        exit_code: 0,
+        msg: 'User created',
+        uid: user.uid, # do we really need this? Should be identical to 'src'
+        pub_key: pub_key.to_s
+      }, :ALL)
+    else #error returned
+      if $?.exitstatus == 9 #user already exists error
+        path = "/home/#{user.property.username}/.ssh/"
+
+        if File.exists?("#{path}/pub_key.pem") && File.exists?("#{path}/key.pem")#if keys exist just read the pub_key for the inform
+          file = File.open("#{path}/pub_key.pem", "rb")
+          pub_key = file.read
+          file.close
+        else
+          key = OpenSSL::PKey::RSA.new(2048)
+          pub_key = key.public_key
+          path = "/home/#{user.property.username}/.ssh/"
+          unless File.directory?(path)#create the directory if it doesn't exist (it will never exist)
+            FileUtils.mkdir_p(path)
+          end
+          File.write("#{path}/pub_key.pem", pub_key.to_pem)
+          File.write("#{path}/key.pem", key.to_pem)
+        end
+        sleep 1
+        user.inform(:status, {
+          status_type: 'APP_EVENT',
+          event: 'EXIT',
+          exit_code: 0,
+          msg: 'User already exists, ssh keys created.',
+          uid: user.uid, # do we really need this? Should be identical to 'src'
+          pub_key: pub_key.to_s
+        }, :ALL)
+      else
+        user.inform(:status, {
+          status_type: 'APP_EVENT',
+          event: 'EXIT',
+          exit_code: -1,
+          msg: 'User creation failed',
+          uid: user.uid, # do we really need this? Should be identical to 'src'
+          pub_key: pub_key.to_s
+        }, :ALL)
+      end
+    end
   end
 
   # This method processes an event coming from the application instance, which
@@ -70,18 +155,18 @@ module OmfRc::ResourceProxy::User
             FileUtils.mkdir_p(path)
           end
 
-          File.write("#{path}/pub_key.pem", pub_key.to_pem)
-          File.write("#{path}/key.pem", key.to_pem)
+          File.write("#{path}/id_rsa.pub", pub_key.to_pem)
+          File.write("#{path}/id_rsa", key.to_pem)
 
           res.inform(:status, {
-                        status_type: 'APP_EVENT',
-                        event: event_type.to_s.upcase,
-                        app: app_id,
-                        exit_code: msg,
-                        msg: msg,
-                        uid: res.uid, # do we really need this? Should be identical to 'src'
-                        pub_key: pub_key
-                      }, :ALL)
+            status_type: 'APP_EVENT',
+            event: event_type.to_s.upcase,
+            app: app_id,
+            exit_code: msg,
+            msg: msg,
+            uid: res.uid, # do we really need this? Should be identical to 'src'
+            pub_key: pub_key.to_pem
+          }, :ALL)
         else #if msg!=0 then the application failed to complete
           path = "/home/#{res.property.username}/.ssh/"
           if File.exists?("#{path}/pub_key.pem") && File.exists?("#{path}/key.pem")#if keys exist just read the pub_key for the inform
@@ -98,36 +183,37 @@ module OmfRc::ResourceProxy::User
               FileUtils.mkdir_p(path)
             end
 
-            File.write("#{path}/pub_key.pem", pub_key.to_pem)
-            File.write("#{path}/key.pem", key.to_pem)
+            File.write("#{path}/id_rsa.pub", pub_key.to_pem)
+            File.write("#{path}/id_rsa", key.to_pem)
           end
           res.inform(:status, {
-                        status_type: 'APP_EVENT',
-                        event: event_type.to_s.upcase,
-                        app: app_id,
-                        exit_code: msg,
-                        msg: msg,
-                        uid: res.uid, # do we really need this? Should be identical to 'src'
-                        pub_key: pub_key
-                      }, :ALL)
+            status_type: 'APP_EVENT',
+            event: event_type.to_s.upcase,
+            app: app_id,
+            exit_code: msg,
+            msg: msg,
+            uid: res.uid, # do we really need this? Should be identical to 'src'
+            pub_key: pub_key.to_pem
+          }, :ALL)
         end
       else
-        res.inform(:status, {
-                      status_type: 'APP_EVENT',
-                      event: event_type.to_s.upcase,
-                      app: app_id,
-                      msg: msg,
-                      uid: res.uid
-                    }, :ALL)
+        # puts "(((((((((((((( error: #{msg} ))))))))))))))))))"
+        # res.inform(:status, {
+        #   status_type: 'APP_EVENT',
+        #   event: event_type.to_s.upcase,
+        #   app: app_id,
+        #   msg: msg,
+        #   uid: res.uid
+        # }, :ALL)
       end
   end
 
   # Build the command line, which will be used to add a new user.
   #
   work('build_command_line') do |res|
-    cmd_line = "env -i " # Start with a 'clean' environment
-    cmd_line += res.property.binary_path + " " # the /usr/sbin/useradd
-    cmd_line += " -m -s /bin/bash #{res.property.username}"  # the username, -m for adding folder -s for default shell to /bin/bash, removed -d /home/#{res.property.username}
+    # cmd_line = "env -i " # Start with a 'clean' environment
+    cmd_line = res.property.binary_path + " " # the /usr/sbin/useradd
+    cmd_line += "-d /home/#{res.property.username} -s /bin/bash #{res.property.username}"  # the username, -m for adding folder -s for default shell to /bin/bash, removed -d /home/#{res.property.username}
     cmd_line
   end
 end

data/lib/nitos_testbed_rc/user_factory.rb

@@ -7,7 +7,7 @@ module OmfRc::ResourceProxy::UserFactory
   register_proxy :user_factory
 
   configure :deluser do |res, value|
-    cmd = 'userdel -r ' + value[:username]
+    cmd = '/usr/sbin/userdel -r -f ' + value[:username]
     system cmd
   end
 end

data/lib/version.rb

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

data/nitos_testbed_rc.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_runtime_dependency "omf_common", "~> 6.1.2.pre.5"
-  s.add_runtime_dependency "omf_rc", "~> 6.1.2.pre.5"
+  s.add_runtime_dependency "omf_common", "~> 6.1.3"
+  s.add_runtime_dependency "omf_rc", "~> 6.1.3"
   s.add_runtime_dependency "nokogiri", "~> 1.6.0"
   s.add_development_dependency "net-ssh", "~> 2.8.0"
 end