]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
GitbuilderProject: change uri to uri_reference
authorAndrew Schoen <aschoen@redhat.com>
Thu, 30 Jul 2015 16:35:10 +0000 (11:35 -0500)
committerAndrew Schoen <aschoen@redhat.com>
Mon, 3 Aug 2015 20:01:49 +0000 (15:01 -0500)
It is not technically a full uri, but a uri reference.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
teuthology/packaging.py

index 5aed3aab6b05be1d93cbe6599e4bdc367049b402..2a7d1c0fe15429bf959cdd5c52a18fe45720123c 100644 (file)
@@ -502,8 +502,20 @@ class GitbuilderProject(object):
         return self._get_base_url()
 
     @property
-    def uri(self):
-        return self._get_uri()
+    def uri_reference(self):
+        """
+        The URI reference that identifies what build of the project
+        we'd like to use.
+
+        For example, the following could be returned::
+
+            ref/<branch>
+            sha1/<sha1>
+            ref/<tag>
+
+        :returns: The uri_reference as a string.
+        """
+        return self._get_uri_reference()
 
     def _parse_version(self, version):
         """
@@ -594,10 +606,10 @@ class GitbuilderProject(object):
 
         return version
 
-    def _get_uri(self):
+    def _get_uri_reference(self):
         """
-        Returns the URI that identifies what build of the project we'd like
-        to use.
+        Returns the URI reference that identifies what build of the project
+        we'd like to use.
 
         If a remote is given, it will attempt to read the config for the given
         remote to find either a tag, branch or sha1 defined. If there is no
@@ -644,7 +656,7 @@ class GitbuilderProject(object):
             arch=self.arch,
             dist=self.distro,
             flavor=self.flavor,
-            uri=self.uri,
+            uri=self.uri_reference,
         )
         return base_url