]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
ShamanProject: split out search URI generation
authorZack Cerza <zack@redhat.com>
Wed, 21 Sep 2016 23:18:58 +0000 (17:18 -0600)
committerZack Cerza <zack@redhat.com>
Tue, 4 Oct 2016 15:01:20 +0000 (09:01 -0600)
Signed-off-by: Zack Cerza <zack@redhat.com>
teuthology/packaging.py

index d4985c4dd293876a21eda10278eaf320f798077b..cc02a3a5408f2a1bdb178c3b3f84011e7cda467e 100644 (file)
@@ -773,6 +773,17 @@ class ShamanProject(GitbuilderProject):
         return self._result_obj
 
     def _search(self):
+        uri = self._search_uri
+        log.debug("Querying %s", uri)
+        resp = requests.get(
+            uri,
+            headers={'content-type': 'application/json'},
+        )
+        resp.raise_for_status()
+        return resp
+
+    @property
+    def _search_uri(self):
         flavor = self.flavor
         if flavor == 'basic':
             flavor = 'default'
@@ -790,13 +801,7 @@ class ShamanProject(GitbuilderProject):
             self.query_url,
             'search',
         ) + '?%s' % req_str
-        log.debug("Querying %s", uri)
-        resp = requests.get(
-            uri,
-            headers={'content-type': 'application/json'},
-        )
-        resp.raise_for_status()
-        return resp
+        return uri
 
     def assert_result(self):
         if len(self._result.json()) == 0: