Merge lp:~robru/cupstream2distro/orthogonal-push into lp:cupstream2distro

[Robert Bruce Park]

Avoid validating bileto request during silo assignment.

[Robert Bruce Park (robru)]

Looks good in staging:

https://ci-train.staging.ubuntu.com/job/prepare-silo/94/console

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~robru/cupstream2distro/orthogonal-push/+merge/270779/+edit-commit-message

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1096
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~robru/cupstream2distro/orthogonal-push/+merge/270779/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/cu2d-choo-choo-ci/778/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/cu2d-choo-choo-ci/778/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'cupstream2distro/silomanager.py'
--- cupstream2distro/silomanager.py	2015-09-11 03:38:43 +0000
+++ cupstream2distro/silomanager.py	2015-09-11 08:38:15 +0000
@@ -39,7 +39,6 @@
 from cupstream2distro.settings import (
     BILETO_API,
     BILETO_GET,
-    BILETO_IP,
     LANDING_SCHEME,
     SILO_NAME_LIST,
     SILOS_DIR,
@@ -123,6 +122,20 @@
     return TOKEN_SCRUB.sub('token=XXX', message)
 
 
+def update_bileto(**kwargs):
+    """Send details to bileto."""
+    try:
+        response = requests.post(
+            BILETO_API, data=json.dumps(kwargs), headers=JSON)
+    except IOError as err:
+        logging.error(
+            'Failed to contact Bileto: {}'.format(scrub(str(err))))
+        return
+    if not response.ok:
+        logging.warning('Bileto says: {} {}'.format(
+            response.status_code, response.reason))
+
+
 class SiloState(object):
     """This class stores and manipulates the silo config json blob."""
     REQUEST_ID_FILE = 'request_id_{}'
@@ -152,7 +165,7 @@
     @staticmethod
     def new_blank(siloname, requestid=''):
         """Create a new SiloState object for a newly-assigned silo."""
-        silo_state = SiloState(siloname, primary=True)
+        silo_state = SiloState(siloname)
         silo_state.requestid = requestid
         return silo_state
 
@@ -329,26 +342,13 @@
 
     def push_to_bileto(self):
         """Submit status information to Bileto."""
-        if not BILETO_IP:
-            logging.warning('Bileto IP unknown: skipping.')
-            return
-        payload = dict(
+        update_bileto(
             job_log=self.job_log,
             published_versions=self.published_versions,
             request_id=self.requestid,
             status=self.status,
             siloname=self.siloname,
         )
-        try:
-            response = requests.post(
-                BILETO_API, data=json.dumps(payload), headers=JSON)
-        except IOError as err:
-            logging.warning(
-                'Failed to contact Bileto: {}'.format(scrub(str(err))))
-            return
-        if not response.ok:
-            logging.warning('Bileto says: {} {}'.format(
-                response.status_code, response.reason))
 
     def save_config(self):
         """Save status messages to appropriate places."""

=== modified file 'tests/unit/test_silomanager.py'
--- tests/unit/test_silomanager.py	2015-09-11 03:38:43 +0000
+++ tests/unit/test_silomanager.py	2015-09-11 08:38:15 +0000
@@ -488,7 +488,6 @@
         ])
 
     @patch('cupstream2distro.silomanager.SiloState.requestid', '121')
-    @patch('cupstream2distro.silomanager.BILETO_IP', '8.8.8.8')
     @patch('cupstream2distro.silomanager.BILETO_API', 'example.com')
     def test_silostate_push_to_bileto(self):
         """Ensure that we push status messages to Bileto."""
@@ -504,7 +503,6 @@
             headers={'content-type': 'application/json'})
 
     @patch('cupstream2distro.silomanager.SiloState.requestid', '121')
-    @patch('cupstream2distro.silomanager.BILETO_IP', '8.8.8.8')
     @patch('cupstream2distro.silomanager.BILETO_API', 'example.com')
     @patch('cupstream2distro.silomanager.requests')
     @patch('cupstream2distro.silomanager.logging')
@@ -512,11 +510,10 @@
         """Report failures to reach Bileto."""
         req_mock.post.side_effect = IOError('token=hello')
         self.state.push_to_bileto()
-        log_mock.warning.assert_called_once_with(
+        log_mock.error.assert_called_once_with(
             'Failed to contact Bileto: token=XXX')
 
     @patch('cupstream2distro.silomanager.SiloState.requestid', '121')
-    @patch('cupstream2distro.silomanager.BILETO_IP', '8.8.8.8')
     @patch('cupstream2distro.silomanager.BILETO_API', 'example.com')
     def test_silostate_push_to_bileto_bad_response(self):
         """Report failures from Bileto."""
@@ -531,11 +528,6 @@
             data=data,
             headers={'content-type': 'application/json'})
 
-    def test_silostate_push_to_bileto_ip_missing(self):
-        """Don't explode if data missing."""
-        self.state.push_to_bileto()
-        self.assertEqual(silomanager.requests.post.mock_calls, [])
-
     def test_silostate_save_config(self):
         """Save config to places."""
         self.state.push_to_ppa_description = Mock()