nitos_testbed_rc 2.0.4 → 2.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTZiYmVkMDBiZDFjNzI0NTIwZDNkMjk2Yjg4ODJjOTU3NzhkODc5Mg==
+    MDg1M2ZkMDhiZDYzNjljNWNjNjQyMjBjMTc3MTcxMmE4ODMxODVkOA==
   data.tar.gz: !binary |-
-    MzEwNTRlODAwYzc3NmYwZWFhNmI2ZDg1NzlmNzVkMzNiODg0ZTgxOQ==
+    MmI4ODcxNmQzZjM5ZGMyZDk1OWQxZjE0YTM4ZjY1NTgwNDhlODA4MA==
 SHA512:
   metadata.gz: !binary |-
-    YmFlNzgyNGQzOGMzZjE5YjMxMWJlZmQxMjYwOTY0OGFiZDc1OTQ2N2ViNmVm
-    Yzk5YzNjYzUyYmE2YzkyMTQxYzdjMDZjMmY2NjRmZWFlMzQzYWMxODY5YzY5
-    Y2QxMzZiNjQyOWM0N2ZmOThkNjQ3NWI1MTZmMjY0YTA0MmNiYmI=
+    ZGMyNjhkNzExNGRjMDUyZmY0ODA2ZTFiMzgwNDEzZDg0OGU0ZjZmMWQ4OTUw
+    OGI4NjNiZTc5MWE1OGNjOTUzMzA5OWI4NjY5MTQ1ZTJlYmEzZWNmNjljNTZk
+    ZGU2YTFkZjRkNWMxOTU1NTdjZGJiZjc4NDQ1YmJiYjAxZjBhMTM=
   data.tar.gz: !binary |-
-    NDFhNTNjYWY4NDFiOGNmNjdiN2U4MGViYjRlYmFjYzM1YzgxN2E5MGMxYzVk
-    ODk5ZDQ4OTA5NDkyMmVlNmU4ZWY5MDMxM2U0YzE1ODUzMWQzNzM3MGVhZGI4
-    YTM4MzI1YmRhYWIyNGI0ZmY2Y2U2MDAzMjVhZWExMzJhMDg2YjU=
+    MTA2OTc3MmVkMmVhNmMyMjg2NDUxNzBmYWQzMjY1ZjgzM2QxOTVkYjVjMDMw
+    NWU4OWE4YTExOTliMjJjOGE5NjQwYzllODQ4MWMzNmYzOWNkZDYwNjliYTlk
+    YTg2YTI1ODY4N2EzNjhjMWU3NGEzODU4MGQ3Mzk0YjYxZTAzZTM=

data/bin/cm_proxy

@@ -57,7 +57,11 @@ class CmPDP
       node_name = msg.properties.respond_to?(:state) ? msg.properties.state.node : msg.properties[:state][:node]
       broker = @config[:broker_url]
 
-      uri = URI.parse("#{broker}/resources/nodes?name=#{node_name}")
+      if node_name.start_with?('e_node_b')
+        uri = URI.parse("#{broker}/resources/lte?name=#{node_name}")
+      else
+        uri = URI.parse("#{broker}/resources/nodes?name=#{node_name}")
+      end
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
@@ -93,15 +97,20 @@ class CmPDP
 
       nod = {}
       nod[:node_name] = node[:name]
-      node[:interfaces].each do |i|
-        if i[:role] == "control"
-          nod[:node_ip] = i[:ips].first[:address]
-          nod[:node_mac] = i[:mac]
-        elsif i[:role] == "cm_network"
-          nod[:node_cm_ip] = i[:ip][:address]
+      if !node[:interfaces].nil? && !node[:interfaces].empty?
+        node[:interfaces].each do |i|
+          if i[:role] == "control"
+            nod[:node_ip] = i[:ips].first[:address]
+            nod[:node_mac] = i[:mac]
+          elsif i[:role] == "cm_network"
+            nod[:node_cm_ip] = i[:ip][:address]
+          end
         end
+      elsif !node[:control_ip].nil? || !node[:control_ip].empty?
+        nod[:node_ip] = node[:control_ip][:address]
+        nod[:node_mac] = ''
       end
-      nod[:node_cm_ip] = node[:cmc][:ip][:address]
+      nod[:node_cm_ip] = node[:cmc][:ip][:address] if node[:cmc]
       
       if acc == 'root'
         debug "AUTH PASSED (root account)"

data/lib/nitos_testbed_rc/cm.rb

@@ -137,6 +137,7 @@ module OmfRc::ResourceProxy::CM
     end
     begin
       debug "Shutting down node '#{node[:node_name]}' through ssh."
+      raise "lte" if node[:name].start_with("e_node_b")
       ssh = Net::SSH.start(node[:node_ip], 'root')#, :password => @password)
       resp = ssh.exec!(SHUTDOWN_CMD)
       ssh.close

data/lib/nitos_testbed_rc/frisbee.rb

@@ -66,6 +66,7 @@ module OmfRc::ResourceProxy::Frisbee #frisbee client
       host = Net::Telnet.new("Host" => client.property.multicast_interface.to_s, "Timeout" => 200, "Prompt" => /[\w().-]*[\$#>:.]\s?(?:\(enable\))?\s*$/)
       while retry_flag < 2
         host.cmd(command.to_s) do |c|
+          puts "$ #{c}"
           if c[0,8] ==  "Progress"
             c = c.split[1]
             client.inform(:status, {

data/lib/nitos_testbed_rc/frisbee_factory.rb

@@ -29,8 +29,11 @@ module OmfRc::ResourceProxy::FrisbeeFactory
   def port_open?(port, seconds=1)
     Timeout::timeout(seconds) do
       begin
-        TCPServer.new('localhost', port) rescue return false
+        serv = TCPServer.new('localhost', port) 
+        serv.close
         return true
+      rescue 
+        return false
       end
     end
   rescue Timeout::Error

data/lib/nitos_testbed_rc/frisbeed.rb

@@ -53,14 +53,16 @@ module OmfRc::ResourceProxy::Frisbeed
     end
     debug "Frisbee server is loading image: #{server.property.image}"
 
-    @app = ExecApp.new(server.property.app_id, server.build_command_line, server.property.map_err_to_out) do |event_type, app_id, msg|
+    @app = {} if @app.nil?
+
+    @app[server.uid] = 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)
     end
   end
 
   hook :before_release do |server|
     begin
-      @app.signal(signal = 'KILL') unless @app.nil?
+      @app[server.uid].signal(signal = 'KILL') unless @app.nil?
     rescue Exception => e
       raise e unless e.message == "No such process"
     ensure

data/lib/nitos_testbed_rc/imagezip_server.rb

@@ -23,6 +23,8 @@ module OmfRc::ResourceProxy::ImagezipServer #Imagezip server
   property :port
   property :image_name, :default => @fconf[:imageDir] + '/new_image.ndz'
 
+  property :app, :default => nil
+
   hook :after_initial_configured do |server|
     debug "Received message '#{server.opts.inspect}'"
     # if error_msg = server.opts.error_msg
@@ -36,13 +38,21 @@ module OmfRc::ResourceProxy::ImagezipServer #Imagezip server
     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|
+    @app = {} if @app.nil?
+
+    @app[server.uid] = 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)
     end
   end
 
   hook :before_release do |server|
-    $ports.delete_if {|x| x == server.property.port} #ports is in frisbee_factory
+    begin
+      @app[server.uid].signal(signal = 'KILL') unless @app[server.uid].nil?
+    rescue Exception => e
+      raise e unless e.message == "No such process"
+    ensure
+      $ports.delete_if {|x| x == server.property.port}
+    end
   end
 
   def process_event(res, event_type, app_id, msg)

data/lib/version.rb

@@ -1,5 +1,5 @@
 module NITOS
   module TestbedRc
-    VERSION = "2.0.4"
+    VERSION = "2.0.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nitos_testbed_rc
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - NITOS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omf_common