Sahara fails to update job execution status if proxy command is used

[Andrew Lazarev]

Steps to repro:
1. Add "proxy_command='ssh user@host nc {host} {port}'" parameter to sahara.conf
2. Run oozie job

Stacktrace:

2014-11-06 17:07:38.801 84012 TRACE sahara.service.edp.job_manager Traceback (most recent call last):
2014-11-06 17:07:38.801 84012 TRACE sahara.service.edp.job_manager File "/Users/alazarev/openstack/sahara/sahara/service/edp/job_manager.py", line 193, in update_job_statuses
2014-11-06 17:07:38.801 84012 TRACE sahara.service.edp.job_manager get_job_status(je.id)
2014-11-06 17:07:38.801 84012 TRACE sahara.service.edp.job_manager File "/Users/alazarev/openstack/sahara/sahara/service/edp/job_manager.py", line 185, in get_job_status
2014-11-06 17:07:38.801 84012 TRACE sahara.service.edp.job_manager job_execution)
2014-11-06 17:07:38.801 84012 TRACE sahara.service.edp.job_manager File "/Users/alazarev/openstack/sahara/sahara/service/edp/job_manager.py", line 68, in _update_job_status
2014-11-06 17:07:38.801 84012 TRACE sahara.service.edp.job_manager job_info = engine.get_job_status(job_execution)
2014-11-06 17:07:38.801 84012 TRACE sahara.service.edp.job_manager File "/Users/alazarev/openstack/sahara/sahara/service/edp/oozie/engine.py", line 76, in get_job_status
2014-11-06 17:07:38.801 84012 TRACE sahara.service.edp.job_manager return self._get_client().get_job_status(job_execution)
2014-11-06 17:07:38.801 84012 TRACE sahara.service.edp.job_manager File "/Users/alazarev/openstack/sahara/sahara/service/edp/oozie/oozie.py", line 56, in get_job_status
2014-11-06 17:07:38.801 84012 TRACE sahara.service.edp.job_manager session = self._get_http_session(job_execution.extra.get('neutron'))
2014-11-06 17:07:38.801 84012 TRACE sahara.service.edp.job_manager File "/Users/alazarev/openstack/sahara/sahara/service/edp/oozie/oozie.py", line 32, in _get_http_session
2014-11-06 17:07:38.801 84012 TRACE sahara.service.edp.job_manager return self.oozie_server.remote().get_http_client(self.port, info=info)
2014-11-06 17:07:38.801 84012 TRACE sahara.service.edp.job_manager File "/Users/alazarev/openstack/sahara/sahara/utils/ssh_remote.py", line 575, in get_http_client
2014-11-06 17:07:38.801 84012 TRACE sahara.service.edp.job_manager info=info, rootwrap_command=rootwrap)
2014-11-06 17:07:38.801 84012 TRACE sahara.service.edp.job_manager File "/Users/alazarev/openstack/sahara/sahara/utils/ssh_remote.py", line 481, in _build_proxy_command
2014-11-06 17:07:38.801 84012 TRACE sahara.service.edp.job_manager info = self.get_neutron_info()
2014-11-06 17:07:38.801 84012 TRACE sahara.service.edp.job_manager File "/Users/alazarev/openstack/sahara/sahara/utils/ssh_remote.py", line 466, in get_neutron_info
2014-11-06 17:07:38.801 84012 TRACE sahara.service.edp.job_manager neutron_info['uri'] = base.url_for(ctx.service_catalog, 'network')
2014-11-06 17:07:38.801 84012 TRACE sahara.service.edp.job_manager File "/Users/alazarev/openstack/sahara/sahara/utils/openstack/base.py", line 52, in url_for
2014-11-06 17:07:38.801 84012 TRACE sahara.service.edp.job_manager _('Service "%s" not found in service catalog') % service_type)
2014-11-06 17:07:38.801 84012 TRACE sahara.service.edp.job_manager SystemError: Service "network" not found in service catalog

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/133132
Committed: https://git.openstack.org/cgit/openstack/sahara/commit/?id=73505fad81872274c17340e0fd8f377e439ae334
Submitter: Jenkins
Branch: master

commit 73505fad81872274c17340e0fd8f377e439ae334
Author: Andrew Lazarev <email address hidden>
Date: Thu Nov 6 17:15:06 2014 -0800

    Fixed job execution update in case of proxy command

    Neutron info is required for proxy command template parameters.

    Change-Id: Icc3d71a1d9ed28855dbe27f7e10fdd48ccc8f455
    Closes-Bug: #1390276