Merge lp:~stylesen/lava-scheduler/multinode into lp:lava-scheduler/multinode

[Senthil Kumaran S]

Handle submissions to localhost in MultiNode - https://cards.linaro.org/browse/LAVA-611

[Neil Williams (codehelp)]

There are secondary issues here. See the test on multinode.v.l.o with this patch applied:
http://multinode.validation.linaro.org/scheduler/job/2305/log_file

The definition still shows localhost, the logfile also shows localhost but the link to the results bundle does work.
  <LAVA_DISPATCHER>2013-08-19 10:39:57 AM INFO: Dashboard : http://localhost/dashboard/permalink/bundle/b61368265dd6f9929a7de6fceff2a04ac2ffc1e2/

So the effect of the patch is correct but the resulting output is confusing. It may be best to do the substitution in the Job Definition so that the output is consistent.

review: Needs Information

[Senthil Kumaran S (stylesen)]

Hi Neil,

On Monday 19 August 2013 04:13 PM, Neil Williams wrote:
> There are secondary issues here. See the test on multinode.v.l.o with this patch applied:
> http://multinode.validation.linaro.org/scheduler/job/2305/log_file
>
> The definition still shows localhost, the logfile also shows localhost but the link to the results bundle does work.
> <LAVA_DISPATCHER>2013-08-19 10:39:57 AM INFO: Dashboard : http://localhost/dashboard/permalink/bundle/b61368265dd6f9929a7de6fceff2a04ac2ffc1e2/
>
> So the effect of the patch is correct but the resulting output is confusing. It may be best to do the substitution in the Job Definition so that the output is consistent.

My patch applies only to multinode job files. I haven't attempted to
change it for single node job files! I shall fix it and request a review
shortly.

Thank You.
--
Senthil Kumaran
http://www.stylesen.org/
http://www.sasenthilkumaran.com/

[lp:~stylesen/lava-scheduler/multinode]

278. By Senthil Kumaran S on 2013-08-19

Rewrite hostname in case of localhost/127.0.0.* provided in submit_results*
for multinode and singlenode in a clean way.

[Senthil Kumaran S (stylesen)]

On Monday 19 August 2013 04:13 PM, Neil Williams wrote:
> There are secondary issues here. See the test on multinode.v.l.o with this patch applied:
> http://multinode.validation.linaro.org/scheduler/job/2305/log_file
>
> The definition still shows localhost, the logfile also shows localhost but the link to the results bundle does work.
> <LAVA_DISPATCHER>2013-08-19 10:39:57 AM INFO: Dashboard : http://localhost/dashboard/permalink/bundle/b61368265dd6f9929a7de6fceff2a04ac2ffc1e2/
>
> So the effect of the patch is correct but the resulting output is confusing. It may be best to do the substitution in the Job Definition so that the output is consistent.

I fixed this and re-requested a review.

Thank You.
--
Senthil Kumaran
http://www.stylesen.org/
http://www.sasenthilkumaran.com/

[Neil Williams (codehelp)]

Tested and approved, thanks.

review: Approve

=== modified file 'lava_scheduler_app/models.py'
--- lava_scheduler_app/models.py	2013-08-16 07:59:57 +0000
+++ lava_scheduler_app/models.py	2013-08-19 11:59:29 +0000
@@ -512,6 +512,7 @@
                                           bundle_stream.is_public)
             server = action['parameters']['server']
             parsed_server = urlparse.urlsplit(server)
+            action["parameters"]["server"] = utils.rewrite_hostname(server)
             if parsed_server.hostname is None:
                 raise ValueError("invalid server: %s" % server)
 
@@ -558,7 +559,7 @@
 
         else:
             job = TestJob(
-                definition=json_data, submitter=submitter,
+                definition=simplejson.dumps(job_data), submitter=submitter,
                 requested_device=target, requested_device_type=device_type,
                 description=job_name, health_check=health_check, user=user,
                 group=group, is_public=is_public, priority=priority)

=== modified file 'lava_scheduler_app/utils.py'
--- lava_scheduler_app/utils.py	2013-08-19 11:00:08 +0000
+++ lava_scheduler_app/utils.py	2013-08-19 11:59:29 +0000
@@ -17,10 +17,30 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with LAVA Scheduler.  If not, see <http://www.gnu.org/licenses/>.
 
+import re
 import copy
+import socket
+import urlparse
 import simplejson
 
 
+def rewrite_hostname(result_url):
+    """If URL has hostname value as localhost/127.0.0.*, change it to the
+    actual server FQDN.
+
+    Returns the RESULT_URL (string) re-written with hostname.
+
+    See https://cards.linaro.org/browse/LAVA-611
+    """
+    host = urlparse.urlparse(result_url).netloc
+    if host == "localhost":
+        result_url = result_url.replace("localhost", socket.getfqdn())
+    elif host.startswith("127.0.0"):
+        ip_pat = r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}'
+        result_url = re.sub(ip_pat, socket.getfqdn(), result_url)
+    return result_url
+
+
 def split_multi_job(json_jobdata, target_group):
     node_json = {}
     all_nodes = {}