rhoconnect 3.2.1 → 3.3.1.beta2

data/bench/scripts/blob_cud_script.rb

@@ -15,12 +15,10 @@ Bench.config do |config|
   config.set_server_state("test_db_storage:application:#{config.user_name}",{})
 
   @create_objects = []
-  @create_count = 5 #50
+  @create_count = 5
 
   @users = Bench.get_bench_users(config.concurrency)
-  @users.each do |u|
-    Bench.create_user(u.user_name, u.password)
-  end
+  @users.each { |u| Bench.create_user(u.user_name, u.password) }
 
   config.concurrency.times do |i|
     @create_objects << []
@@ -38,31 +36,29 @@ Bench.config do |config|
   end
 end
 
-
 Bench.test do |config, session|
   sleep rand(10) 
-
   user = @users[session.thread_id]
-  session.post "clientlogin", "#{config.base_url}/clientlogin", :content_type => :json do
+  session.post "clientlogin", "#{config.host}/rc/#{Rhoconnect::API_VERSION}/app/login", :content_type => :json do
     {:login => user.user_name, :password => user.password}.to_json
   end
+
   sleep rand(10)
-  
-  session.get "clientcreate", "#{config.base_url}/clientcreate"
+  session.post "clientcreate", "#{config.host}/rc/#{Rhoconnect::API_VERSION}/clients"
   session.client_id = JSON.parse(session.last_result.body)['client']['client_id']
   create_objs = @create_objects[session.thread_id][session.iteration]
-  body = { :cud =>  {:source_name => 'BlobAdapter', :client_id => session.client_id,
-    :blob_fields => ['img_file-rhoblob'],
-    :create => create_objs, :version => 3}.to_json
+  body = { :cud =>  {:source_name => 'BlobAdapter',
+    :blob_fields => ['img_file-rhoblob'], :create => create_objs}.to_json 
   }
-  session.post "create-object", "#{config.base_url}/queue_updates" do  
-    body.merge!(Bench.get_image_data(create_objs)) # Add images to miltipart post
-  end      
+  session.post "create-object", "#{config.host}/app/#{Rhoconnect::API_VERSION}/#{config.adapter_name}/queue_updates",
+    {:content_type => :json, 'X-RhoConnect-CLIENT-ID' => session.client_id} do
+      body.merge!(Bench.get_image_data(create_objs)) # Add images to miltipart post
+    end
   session.last_result.verify_code(200)
-  sleep rand(10)  
 
+  sleep rand(10)
   bench_log "#{session.log_prefix} User \"#{user.user_name}\": Loop to get available objects ..."
-  count = get_all_objects(current_line,config,session,@expected_md,create_objs)
+  count = get_all_objects(current_line, config, session, @expected_md, create_objs)
   bench_log "#{session.log_prefix} User \"#{user.user_name}\": Got #{count} available objects ..."
 end
 

data/bench/scripts/cud_script.rb

@@ -3,7 +3,7 @@ bench_log "Simulate creating multiple objects"
 
 Bench.config do |config|
   config.concurrency = 5
-  config.iterations  = 2
+  config.iterations  = 2 
   config.user_name = "benchuser"
   config.password = "password"
   config.adapter_name = 'MockAdapter'
@@ -38,25 +38,25 @@ end
 
 Bench.test do |config,session|
   sleep rand(10)
-
   user = @users[session.thread_id]
-  session.post "clientlogin", "#{config.base_url}/clientlogin", :content_type => :json do
+  session.post "clientlogin", "#{config.host}/rc/#{Rhoconnect::API_VERSION}/app/login", :content_type => :json do
     {:login => user.user_name, :password => user.password}.to_json
-  end
+  end    
   sleep rand(10)
 
-  session.get "clientcreate", "#{config.base_url}/clientcreate"
+  session.post "clientcreate", "#{config.host}/rc/#{Rhoconnect::API_VERSION}/clients"    
   session.client_id = JSON.parse(session.last_result.body)['client']['client_id']
   create_objs = @create_objects[session.thread_id][session.iteration]
-  session.post "create-object", "#{config.base_url}/queue_updates", :content_type => :json do
-    {:source_name => 'MockAdapter', :client_id => session.client_id,
-     :create => create_objs, :version => 3}.to_json
-  end
+  session.post "create-object",
+    "#{config.host}/app/#{Rhoconnect::API_VERSION}/#{config.adapter_name}/queue_updates", 
+    {:content_type => :json, 'X-RhoConnect-CLIENT-ID' => session.client_id} do
+      {:create => create_objs}.to_json
+    end  
   session.last_result.verify_code(200)
   sleep rand(10)
 
   bench_log "#{session.log_prefix} User \"#{user.user_name}\": Loop to get available objects ..."
-   count = get_all_objects(current_line,config,session,@expected_md,create_objs)
+  count = get_all_objects(current_line,config,session,@expected_md,create_objs)
   bench_log "#{session.log_prefix} User \"#{user.user_name}\": Got #{count} available objects ..."
 end  
 
@@ -84,8 +84,7 @@ Bench.verify do |config,sessions|
   
   master_doc = {}
   @users.each do |user|
-    user_doc = config.get_server_state(
-      source_docname(user.user_name, 'MockAdapter',:md))
+    user_doc = config.get_server_state(source_docname(user.user_name, 'MockAdapter',:md))
     master_doc.merge!(user_doc)
   end
   Bench.verify_error = Bench.compare_and_log(@expected_md, master_doc, current_line)

data/bench/scripts/helpers.rb

@@ -64,11 +64,11 @@ module BenchHelpers
     
   def current_line
     caller(1)[0].to_s
-  end  
+  end
       
   def get_all_objects(caller,config,session,expected_md,create_objs=nil,timeout=10)
-    session.get "get-cud", "#{config.base_url}/query" do
-      {'source_name' => config.adapter_name, 'client_id' => session.client_id, 'p_size' => @datasize}
+    session.get "get-cud", "#{config.host}/app/#{Rhoconnect::API_VERSION}/#{config.adapter_name}" do
+      {'client_id' => session.client_id, 'p_size' => @datasize}
     end
     sleep rand(timeout)
     token = JSON.parse(session.last_result.body)[1]['token']
@@ -82,10 +82,8 @@ module BenchHelpers
 
     while token != '' do
       sleep rand(timeout)
-      session.get "ack-cud", "#{config.base_url}/query"  do
-        { 'source_name' => config.adapter_name,
-          'client_id' => session.client_id,
-          'token' => token}
+      session.get "ack-cud", "#{config.host}/app/#{Rhoconnect::API_VERSION}/#{config.adapter_name}" do
+        {'client_id' => session.client_id, 'token' => token}
       end
       session.last_result.verify_code(200)
       verify_count(session,caller+"\n"+current_line)

data/bench/scripts/query_md_script.rb

@@ -7,10 +7,11 @@ bench_log "Run sync session, forces source adapter query on every sync request"
 @ack_token = "[{\"version\":3},{\"token\":\"\"},{\"count\":0},{\"progress_count\":%i},{\"total_count\":%i},{}]"
 
 Bench.config do |config|
-  config.concurrency = 2
+  config.concurrency = 5
   config.iterations  = 2
   config.user_name = "benchuser"
   config.password = "password"
+  config.adapter_name = 'MockAdapter'  
   config.get_test_server
   config.reset_app
   config.set_server_state("test_db_storage:application:#{config.user_name}",@expected)
@@ -19,26 +20,31 @@ end
 
 Bench.test do |config,session|
   sleep rand(10)
-  session.post "clientlogin", "#{config.base_url}/clientlogin", :content_type => :json do
+  session.post "clientlogin", "#{config.host}/rc/#{Rhoconnect::API_VERSION}/app/login", :content_type => :json do
     {:login => config.user_name, :password => config.password}.to_json
-  end
+  end    
+  
   sleep rand(10)
-  session.get "clientcreate", "#{config.base_url}/clientcreate"
+  session.post "clientcreate", "#{config.host}/rc/#{Rhoconnect::API_VERSION}/clients"
   client_id = JSON.parse(session.last_result.body)['client']['client_id']
-  session.get "get-cud", "#{config.base_url}/query" do
-    {'source_name' => 'MockAdapter', 'client_id' => client_id, 'p_size' => @datasize}
-  end
+  session.get "get-cud",
+    "#{config.host}/app/#{Rhoconnect::API_VERSION}/#{config.adapter_name}",
+    {'X-RhoConnect-CLIENT-ID' => client_id} do
+      {'p_size' => @datasize}
+    end
+
   sleep rand(10)
   token = JSON.parse(session.last_result.body)[1]['token']
   session.last_result.verify_body([{:version => 3},{:token => token}, 
     {:count => @datasize},{:progress_count => 0},{:total_count => @datasize}, 
     {:insert => @expected}].to_json)
+      
   sleep rand(10)
-  session.get "ack-cud", "#{config.base_url}/query" do
-    { 'source_name' => 'MockAdapter', 
-      'client_id' => client_id,
-      'token' => token}
-  end
+  session.get "ack-cud",
+    "#{config.host}/app/#{Rhoconnect::API_VERSION}/#{config.adapter_name}",
+    {'X-RhoConnect-CLIENT-ID' => client_id} do
+      {'token' => token}
+    end
   session.last_result.verify_code(200)
   session.last_result.verify_body([{:version => 3},{:token => ''},{:count => 0},
     {:progress_count => @datasize},{:total_count => @datasize},{}].to_json)

data/bench/scripts/query_only_script.rb

@@ -13,38 +13,46 @@ Bench.config do |config|
   config.iterations  = 2
   config.user_name = "benchuser"
   config.password = "password"
+  config.adapter_name = 'MockAdapter'  
   config.get_test_server
   config.reset_app
   config.set_server_state("test_db_storage:application:#{config.user_name}",@expected)
   config.reset_refresh_time('MockAdapter')
-  res = RestClient.post "#{config.base_url}/clientlogin", 
+
+  res = RestClient.post "#{config.host}/rc/#{Rhoconnect::API_VERSION}/app/login", 
     {:login => config.user_name, :password => config.password}, :content_type => :json
   res.cookies['rhoconnect_session'] = CGI.escape(res.cookies['rhoconnect_session'])
   @cookies = res.cookies
+
   (config.concurrency*config.iterations).times do |i|
-    create = RestClient.get "#{config.base_url}/clientcreate", {:cookies => @cookies}
-    puts "Created client ##{i}..."
+    create = RestClient.post "#{config.host}/rc/#{Rhoconnect::API_VERSION}/clients",
+      '', {:cookies => @cookies}
     @clients << JSON.parse(create.body)['client']['client_id']
+    puts "Created client ##{i} ..."
   end
 end
 
 Bench.test do |config,session|
   client_id = @clients[session.thread_id*config.iterations+session.iteration]
   session.cookies = @cookies
+  
   sleep rand(10)
-  session.get "get-cud", "#{config.base_url}/query" do
-    {'source_name' => 'MockAdapter', 'client_id' => client_id, 'p_size' => @datasize}
-  end
+  session.get "get-cud", "#{config.host}/app/#{Rhoconnect::API_VERSION}/#{config.adapter_name}",
+    {'X-RhoConnect-CLIENT-ID' => client_id} do
+      {'p_size' => @datasize}
+    end
+  
   token = JSON.parse(session.last_result.body)[1]['token']
   session.last_result.verify_body([{:version => 3},{:token => token}, 
     {:count => @datasize},{:progress_count => 0},{:total_count => @datasize}, 
     {:insert => @expected}].to_json)
+  
   sleep rand(10)
-  session.get "ack-cud", "#{config.base_url}/query" do
-    { 'source_name' => 'MockAdapter', 
-      'client_id' => client_id,
-      'token' => token}
-  end
+  session.get "ack-cud",
+    "#{config.host}/app/#{Rhoconnect::API_VERSION}/#{config.adapter_name}",
+    {'X-RhoConnect-CLIENT-ID' => client_id} do
+      {'token' => token}
+    end
   session.last_result.verify_code(200)
   session.last_result.verify_body([{:version => 3},{:token => ''},{:count => 0},
     {:progress_count => @datasize},{:total_count => @datasize},{}].to_json)

data/bench/scripts/query_script.rb

@@ -11,6 +11,7 @@ Bench.config do |config|
   config.iterations  = 2
   config.user_name = "benchuser"
   config.password = "password"
+  config.adapter_name = 'MockAdapter'
   config.get_test_server
   config.reset_app
   config.set_server_state("test_db_storage:application:#{config.user_name}",@expected)
@@ -19,27 +20,30 @@ end
 
 Bench.test do |config,session|
   sleep rand(10)
-  session.post "clientlogin", "#{config.base_url}/clientlogin", :content_type => :json do
+  session.post "clientlogin", "#{config.host}/rc/#{Rhoconnect::API_VERSION}/app/login", :content_type => :json do
     {:login => config.user_name, :password => config.password}.to_json
   end
+  
   sleep rand(10)
-  session.get "clientcreate", "#{config.base_url}/clientcreate"
+  session.post "clientcreate", "#{config.host}/rc/#{Rhoconnect::API_VERSION}/clients"
   client_id = JSON.parse(session.last_result.body)['client']['client_id']
-  session.get "get-cud", "#{config.base_url}/query" do
-    {'source_name' => 'MockAdapter', 'client_id' => client_id, 'p_size' => @datasize}
-  end
+  session.get "get-cud", "#{config.host}/app/#{Rhoconnect::API_VERSION}/#{config.adapter_name}",
+    {'X-RhoConnect-CLIENT-ID' => client_id} do
+      {'p_size' => @datasize}
+    end
+  
   sleep rand(10)
   token = JSON.parse(session.last_result.body)[1]['token']
-  session.last_result.verify_body([{:version => 3},{:token => token}, 
+   session.last_result.verify_body([{:version => 3},{:token => token}, 
     {:count => @datasize},{:progress_count => 0},{:total_count => @datasize}, 
     {:insert => @expected}].to_json)
-  sleep rand(10)
-  session.get "ack-cud", "#{config.base_url}/query" do
-    { 'source_name' => 'MockAdapter', 
-      'client_id' => client_id,
-      'token' => token}
-  end
+
+  sleep rand(10)  
+  session.get "ack-cud", "#{config.host}/app/#{Rhoconnect::API_VERSION}/#{config.adapter_name}",
+    {'X-RhoConnect-CLIENT-ID' => client_id} do
+      {'token' => token}
+    end
   session.last_result.verify_code(200)
   session.last_result.verify_body([{:version => 3},{:token => ''},{:count => 0},
     {:progress_count => @datasize},{:total_count => @datasize},{}].to_json)
-end  
+end

data/bench/scripts/test_query_script.rb

@@ -20,7 +20,7 @@ Bench.config do |config|
     config.reset_app
     @expected = Bench.get_test_data(@datasize)
     config.set_server_state("test_db_storage:application:#{config.user_name}",@expected)
-    config.reset_refresh_time('RhoInternalBenchmarkAdapter', 0)
+    #config.reset_refresh_time('RhoInternalBenchmarkAdapter', 0)
     config.set_simulate_time('RhoInternalBenchmarkAdapter', Bench.simtime)
   end
 end
@@ -38,27 +38,56 @@ Bench.synchronize do |config|
 end
 
 Bench.test do |config,session|
-  session.post "clientlogin", "#{config.base_url}/clientlogin", :content_type => :json do
+  session.post "clientlogin", "#{config.host}/rc/#{Rhoconnect::API_VERSION}/app/login", :content_type => :json do
     {:login => config.user_name, :password => config.password}.to_json
   end
-  session.get "clientcreate", "#{config.base_url}/clientcreate"
+  session.post "clientcreate", "#{config.host}/rc/#{Rhoconnect::API_VERSION}/clients"
   client_id = JSON.parse(session.last_result.body)['client']['client_id']
   session.client_id = client_id
-  session.post "clientregister", "#{config.base_url}/clientregister", :content_type => :json do
-    {:device_type => "Apple", :device_pin => 'somepin123', :device_port => "device_port_111", :phone_id => 'unique_phone_id',
-      :client_id => client_id}.to_json
+
+  session.post "clientregister", "#{config.host}/rc/#{Rhoconnect::API_VERSION}/clients/#{session.client_id}/register",
+    {:content_type => :json} do
+      {:device_type => "Apple", :device_pin => 'somepin123', :device_port => "device_port_111",
+        :phone_id => 'unique_phone_id'}.to_json
+    end
+    
+  pagesize = @datasize
+  pagesize = @datasize/10 if @datasize > 1000
+  session.get "get-cud",
+    "#{config.host}/app/#{Rhoconnect::API_VERSION}/RhoInternalBenchmarkAdapter",
+    {'X-RhoConnect-CLIENT-ID' => session.client_id} do
+      {'p_size' => pagesize}
+    end
+  token = JSON.parse(session.last_result.body)[1]['token']
+  while (token != '') do
+    session.get "ack-cud",
+      "#{config.host}/app/#{Rhoconnect::API_VERSION}/RhoInternalBenchmarkAdapter",
+      {'X-RhoConnect-CLIENT-ID' => session.client_id} do
+        {'token' => token,
+          'p_size' => pagesize}
+      end
+    token = JSON.parse(session.last_result.body)[1]['token']
+    session.last_result.verify_code(200)
   end
+
+  obj_to_delete = @expected.keys[rand(@datasize - 1)]
+  @expected.delete(obj_to_delete)
+  @datasize = @datasize - 1
+  session.delete "delete_object",
+    "#{config.host}/app/#{Rhoconnect::API_VERSION}/RhoInternalBenchmarkAdapter/#{obj_to_delete}",
+    {'X-RhoConnect-CLIENT-ID' => session.client_id}
+  session.last_result.verify_code(200)
   
-  session.get "get-cud", "#{config.base_url}/query" do
-    {'source_name' => 'RhoInternalBenchmarkAdapter', 'client_id' => session.client_id, 'p_size' => @datasize}
-  end
-  token = JSON.parse(session.last_result.body)[1]['token']
-  session.get "ack-cud", "#{config.base_url}/query" do
-    { 'source_name' => 'RhoInternalBenchmarkAdapter', 
-      'client_id' => session.client_id,
-      'token' => token}
+  obj_to_delete = @expected.keys[rand(@datasize - 1)]
+  @expected.delete(obj_to_delete)
+  @datasize = @datasize - 1
+  session.post "push_deletes", 
+    "#{config.host}/app/#{Rhoconnect::API_VERSION}/RhoInternalBenchmarkAdapter/push_deletes",
+      {'X-RhoConnect-API-TOKEN' => config.token, :content_type => :json} do
+    {:user_id => config.user_name,
+      :rebuild_md => false,
+      :objects => [obj_to_delete]
+    }.to_json
   end
   session.last_result.verify_code(200)
-  session.last_result.verify_body([{:version => 3},{:token => ''},{:count => 0},
-    {:progress_count => @datasize},{:total_count => @datasize},{}].to_json)
-end  
+end

data/bench/scripts/test_source_script.rb

@@ -18,10 +18,10 @@ end
 
 
 Bench.test do |config,session|
-  session.post "save_adapter", "#{config.host}/api/source/save_adapter", :content_type => :json do
-    {:api_token => @token, :attributes => {:adapter_url => @save_adapter_url}}.to_json
-  end
-  session.post "get_adapter", "#{config.host}/api/source/get_adapter", :content_type => :json do
-    {:api_token => @token}.to_json
-  end
-end  
+  session.post "save_adapter", "#{config.host}/rc/#{Rhoconnect::API_VERSION}/system/appserver",
+    {'X-RhoConnect-API-TOKEN' => @token, :content_type => :json } do
+      {:attributes => {:adapter_url => @save_adapter_url}}.to_json
+    end
+  session.get "get_adapter", "#{config.host}/api/source/get_adapter",
+    {'X-RhoConnect-API-TOKEN' => @token, :content_type => :json }
+end

data/commands/commands/dtach_commands/dtach_install.rb

@@ -1,3 +1,32 @@
+require 'net/http'
+
+def fetch(uri_str, limit = 10)
+  raise ArgumentError, 'Too many HTTP redirects' if limit == 0
+
+  url = URI(uri_str)
+  response = Net::HTTP.get_response(url)
+  
+  case response
+  when Net::HTTPOK then
+    Net::HTTP.start(url.host, url.port) do |http|
+      download_file = open("dtach-0.8.tar.gz", "wb")
+      begin
+        http.request_get(url.path) do |resp|
+        resp.read_body { |segment| download_file.write(segment) }
+        end
+      ensure
+        download_file.close
+      end
+    end
+  when Net::HTTPRedirection then
+    location = response['location']
+    puts "Redirected to #{location}"
+    fetch(location, limit - 1)
+  else
+    puts "Failed to download dtach-0.8.tar.gz file. Response code: #{response.value}"
+  end
+end
+
 Execute.define_task do
   desc 'dtach-install', 'Install dtach 0.8 from source'
   def dtach_install
@@ -5,26 +34,25 @@ Execute.define_task do
     
     unless windows?
       Dir.chdir('/tmp/')
-      unless File.exists?('/tmp/dtach-0.8.tar.gz')
-        require 'net/http'
+      system "rm /tmp/dtach-0.8.tar.gz" if File.exists?('/tmp/dtach-0.8.tar.gz')
+      system "rm -rf /tmp/dtach-0.8" if File.directory?('/tmp/dtach-0.8')
 
-        url = 'http://downloads.sourceforge.net/project/dtach/dtach/0.8/dtach-0.8.tar.gz'
-        open('/tmp/dtach-0.8.tar.gz', 'wb') do |file| file.write(open(url).read) end
-      end #do
+      uri_str = "http://sourceforge.net/projects/dtach/files/dtach/0.8/dtach-0.8.tar.gz"
+      fetch(uri_str, limit = 10)
 
-      unless File.directory?('/tmp/dtach-0.8')
-        system('tar xzf dtach-0.8.tar.gz')
-      end #unless
+      raise "Failed to download dtach-0.8.tar.gz file." unless File.exists?('dtach-0.8.tar.gz') && File.stat('dtach-0.8.tar.gz').size != 0
 
-      ENV['PREFIX'] and bin_dir = "#{ENV['PREFIX']}/bin" or bin_dir = "#{RedisRunner.prefix}bin"
-      
-      mk_bin_dir(bin_dir)
-	    
+      system('tar xzf dtach-0.8.tar.gz')
       Dir.chdir('/tmp/dtach-0.8/')
       system 'cd /tmp/dtach-0.8/ && ./configure && make'
-      system "cp /tmp/dtach-0.8/dtach #{bin_dir}"
 
+      ENV['PREFIX'] and bin_dir = "#{ENV['PREFIX']}/bin" or bin_dir = "#{RedisRunner.prefix}bin"
+      mk_bin_dir(bin_dir)
+      system "sudo cp /tmp/dtach-0.8/dtach #{bin_dir}"
+
+      system "rm /tmp/dtach-0.8.tar.gz"
+      system "rm -rf /tmp/dtach-0.8"
       puts "Dtach successfully installed to #{bin_dir}"
-    end #unless
-  end #dtach_install
-end #do
+    end
+  end
+end