linaro-release team mailing list archive

[Spring Zhang <spring.zhang@xxxxxxxxxx>]

Spring Zhang has proposed merging lp:~qzhang/lava-dispatcher/fix-827727 into lp:lava-dispatcher.

Requested reviews:
  Linaro Validation Team (linaro-validation)
Related bugs:
  Bug #827727 in LAVA Dispatcher: "dispatcher only works with dashboard endpoint"
  https://bugs.launchpad.net/lava-dispatcher/+bug/827727

For more details, see:
https://code.launchpad.net/~qzhang/lava-dispatcher/fix-827727/+merge/74351

fix bug 827727, change dashboard pushing endpoint from xml-rpc to RPC2, tested and it works.

** It will impact all the job json files definition, please make submit url end of 'lava-server' of all job files  **
-- 
https://code.launchpad.net/~qzhang/lava-dispatcher/fix-827727/+merge/74351
Your team Linaro Validation Team is requested to review the proposed merge of lp:~qzhang/lava-dispatcher/fix-827727 into lp:lava-dispatcher.

=== modified file 'doc/android-0xbench-job.json'
--- doc/android-0xbench-job.json	2011-06-02 20:00:26 +0000
+++ doc/android-0xbench-job.json	2011-09-07 06:45:23 +0000
@@ -28,7 +28,7 @@
       "command": "submit_results",
       "parameters":
         {
-          "server": "http://validation.linaro.org/launch-control";,
+          "server": "http://validation.linaro.org/lava-server";,
           "stream": "/anonymous/android-panda01-0xbench/",
           "result_disk": "sdcard"
         }

=== modified file 'doc/android-basic-job.json'
--- doc/android-basic-job.json	2011-06-02 20:00:26 +0000
+++ doc/android-basic-job.json	2011-09-07 06:45:23 +0000
@@ -28,7 +28,7 @@
       "command": "submit_results_on_host",
       "parameters":
         {
-          "server": "http://validation.linaro.org/launch-control";,
+          "server": "http://validation.linaro.org/lava-server";,
           "stream": "/anonymous/android-panda01-basic/"
         }
     }

=== modified file 'doc/android-monkey-job.json'
--- doc/android-monkey-job.json	2011-06-02 20:00:26 +0000
+++ doc/android-monkey-job.json	2011-09-07 06:45:23 +0000
@@ -28,7 +28,7 @@
       "command": "submit_results_on_host",
       "parameters":
         {
-          "server": "http://validation.linaro.org/launch-control";,
+          "server": "http://validation.linaro.org/lava-server";,
           "stream": "/anonymous/android-panda01-monkey/"
         }
     }

=== renamed file 'doc/lava-ltp-job' => 'doc/lava-ltp-job.json'
--- doc/lava-ltp-job	2011-06-10 04:46:04 +0000
+++ doc/lava-ltp-job.json	2011-09-07 06:45:23 +0000
@@ -32,7 +32,7 @@
       "command": "submit_results",
       "parameters":
         {
-          "server": "http://validation.linaro.org/launch-control";,
+          "server": "http://validation.linaro.org/lava-server";,
           "stream": "/anonymous/panda01-ltp/"
         }
     }

=== modified file 'doc/lava-out-of-tree-test-1.json'
--- doc/lava-out-of-tree-test-1.json	2011-08-19 01:32:22 +0000
+++ doc/lava-out-of-tree-test-1.json	2011-09-07 06:45:23 +0000
@@ -40,7 +40,7 @@
       "command": "submit_results",
       "parameters":
         {
-          "server": "http://validation.linaro.org/launch-control";,
+          "server": "http://validation.linaro.org/lava-server";,
           "stream": "/anonymous/panda01-tesing/"
         }
     }

=== modified file 'doc/lava-out-of-tree-test-2.json'
--- doc/lava-out-of-tree-test-2.json	2011-08-18 20:38:38 +0000
+++ doc/lava-out-of-tree-test-2.json	2011-09-07 06:45:23 +0000
@@ -33,7 +33,7 @@
       "command": "submit_results",
       "parameters":
         {
-          "server": "http://validation.linaro.org/launch-control";,
+          "server": "http://validation.linaro.org/lava-server";,
           "stream": "/anonymous/panda01-testing/"
         }
     }

=== modified file 'lava_dispatcher/actions/launch_control.py'
--- lava_dispatcher/actions/launch_control.py	2011-09-06 09:35:13 +0000
+++ lava_dispatcher/actions/launch_control.py	2011-09-07 06:45:23 +0000
@@ -35,7 +35,7 @@
 
 class cmd_submit_results_on_host(BaseAction):
     def run(self, server, stream):
-        xmlrpc_url = "%s/xml-rpc/" % server
+        xmlrpc_url = "%s/RPC2/" % server
         srv = xmlrpclib.ServerProxy(xmlrpc_url,
                 allow_none=True, use_datetime=True)
 
@@ -48,7 +48,7 @@
             f.close()
             try:
                 print >> self.context.oob_file, 'dashboard-put-result:', \
-                      srv.put_ex(content, bundle, stream)
+                      srv.dashboard.put_ex(content, bundle, stream)
             except xmlrpclib.Fault, err:
                 print "xmlrpclib.Fault occurred"
                 print "Fault code: %d" % err.faultCode
@@ -66,7 +66,7 @@
         :param stream: Stream on the launch-control server to save the result to
         """
         #Create l-c server connection
-        xmlrpc_url = "%s/xml-rpc/" % server
+        xmlrpc_url = "%s/RPC2/" % server
         srv = xmlrpclib.ServerProxy(xmlrpc_url,
                 allow_none=True, use_datetime=True)
 
@@ -142,7 +142,8 @@
             test_run['attributes'] = attributes
         json_bundle = json.dumps(main_bundle)
         print >> self.context.oob_file, 'dashboard-put-result:', \
-              srv.put_ex(json_bundle, 'lava-dispatcher.bundle', stream)
+              srv.dashboard.put_ex(json_bundle, 'lava-dispatcher.bundle',\
+                stream)
 
         if master_ip == None:
             raise NetworkError(err_msg)