Merge lp:~jpds/launchpad/fix_361650_model_changes into lp:launchpad
- fix_361650_model_changes
- Merge into devel
Proposed by
Jonathan Davies
| Status: | Merged |
|---|---|
| Approved by: | Curtis Hovey |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 10619 |
| Proposed branch: | lp:~jpds/launchpad/fix_361650_model_changes |
| Merge into: | lp:launchpad |
| Diff against target: |
857 lines (+470/-93) 11 files modified
lib/lp/registry/configure.zcml (+47/-5) lib/lp/registry/doc/distribution-mirror.txt (+119/-1) lib/lp/registry/interfaces/distribution.py (+9/-1) lib/lp/registry/interfaces/distributionmirror.py (+96/-47) lib/lp/registry/model/distribution.py (+11/-0) lib/lp/registry/model/distributionmirror.py (+63/-1) lib/lp/registry/stories/distributionmirror/xx-distribution-mirrors.txt (+11/-11) lib/lp/registry/stories/webservice/xx-distribution-mirror.txt (+20/-11) lib/lp/registry/stories/webservice/xx-distribution.txt (+74/-0) lib/lp/registry/tests/test_distributionmirror.py (+4/-14) lib/lp/testing/factory.py (+16/-2) |
| To merge this branch: | bzr merge lp:~jpds/launchpad/fix_361650_model_changes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Curtis Hovey (community) | code | Approve | |
|
Review via email:
|
|||
Commit message
Added models and tests for DistributionMir
Description of the change
= Summary =
This branch builds on the schema changes introduced for bug #361650. Adding stuff to our models.
It also adds the API parts and mirror checks when marking mirrors as country mirrors with complete test suite.
To post a comment you must log in.
Revision history for this message
| Curtis Hovey (sinzui) wrote : | # |
Download full text (5.9 KiB)
Hi Jonathan.
I have some trivial suggestions to improve this branch. I think the implementation
is good and ready to land.
I can land the branch at the end of this week after these changes are made.
make lint reported these problems that need fixing:
lib/lp/
339: [C0301] Line too long (83/78)
436: [W0311] Bad indentation. Found 7 spaces, expected 8
> === modified file 'lib/lp/
> --- lib/lp/
> +++ lib/lp/
@@ -814,3 +814,107 @@
> +Country DNS mirrors
> +------
> +
> +Country DNS mirrors are mirrors which have been assigned $CC.archive.
> +or $CC.releases.
Wrap the narrative at 78 characters.
> + >>> login('<email address hidden>')
> + >>> ubuntu_distro = getUtility(
> + >>> de_archive_mirror = factory.
> + ... "Technische Universitaet Dresden", country=82,
> + ... http_url="http://
> + ... official_
> + >>> davis_station_
> + ... "Davis Station", country=9,
> + ... http_url="http://
> + ... official_
> + >>> de_archive_
> + >>> de_archive_
> + >>> logout()
Wrap the code at 78 characters.
...
> +Mirrors which are not official or do not have an HTTP URL may not be set as
> +country mirrors:
> +
> + >>> login('<email address hidden>')
> + >>> osuosl_mirror = factory.
> + ... country=226,
> + ... ftp_url="ftp://ubuntu.
> + ... official_
> + >>> osuosl_
> + >>> print osuosl_
> + None
Wrap the code at 78 characters.
> === modified file 'lib/lp/
> --- lib/lp/
> +++ lib/lp/
>
> @@ -321,6 +321,14 @@
> if it's not found.
> """
>
> + @operation_
> + country=
> + mirror_
> + @operation_
> + @export_
> + def getCountryMirro
> + """Return the country DNS mirror for acountry and content type."""
grammar: s/acountry/a country/
> === modified file 'lib/lp/
> --- lib/lp/
> +++ lib/lp/
> @@ -6,21 +6,24 @@
> __metaclass__ = type
__all__ = [
...
> + ...
review:
Needs Fixing
(code)
Revision history for this message
| Curtis Hovey (sinzui) : | # |
review:
Approve
(code)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'lib/lp/registry/configure.zcml' | |||
| 2 | --- lib/lp/registry/configure.zcml 2010-03-19 11:33:44 +0000 | |||
| 3 | +++ lib/lp/registry/configure.zcml 2010-03-31 15:03:35 +0000 | |||
| 4 | @@ -1644,18 +1644,60 @@ | |||
| 5 | 1644 | <!-- DistributionMirror --> | 1644 | <!-- DistributionMirror --> |
| 6 | 1645 | <class class="lp.registry.model.distributionmirror.DistributionMirror"> | 1645 | <class class="lp.registry.model.distributionmirror.DistributionMirror"> |
| 7 | 1646 | <allow | 1646 | <allow |
| 9 | 1647 | interface="lp.registry.interfaces.distributionmirror.IDistributionMirrorPublic" /> | 1647 | attributes=" |
| 10 | 1648 | id | ||
| 11 | 1649 | name | ||
| 12 | 1650 | displayname | ||
| 13 | 1651 | description | ||
| 14 | 1652 | distribution | ||
| 15 | 1653 | http_base_url | ||
| 16 | 1654 | ftp_base_url | ||
| 17 | 1655 | rsync_base_url | ||
| 18 | 1656 | enabled | ||
| 19 | 1657 | speed | ||
| 20 | 1658 | status | ||
| 21 | 1659 | country | ||
| 22 | 1660 | content | ||
| 23 | 1661 | owner | ||
| 24 | 1662 | title | ||
| 25 | 1663 | cdimage_series | ||
| 26 | 1664 | source_series | ||
| 27 | 1665 | arch_series | ||
| 28 | 1666 | last_probe_record | ||
| 29 | 1667 | all_probe_records | ||
| 30 | 1668 | has_ftp_or_rsync_base_url | ||
| 31 | 1669 | base_url | ||
| 32 | 1670 | date_created | ||
| 33 | 1671 | country_dns_mirror | ||
| 34 | 1672 | mirrorMustHaveHTTPOrFTPURL | ||
| 35 | 1673 | getSummarizedMirroredSourceSeries | ||
| 36 | 1674 | getSummarizedMirroredArchSeries | ||
| 37 | 1675 | getOverallFreshness | ||
| 38 | 1676 | isOfficial | ||
| 39 | 1677 | shouldDisable | ||
| 40 | 1678 | disable | ||
| 41 | 1679 | newProbeRecord | ||
| 42 | 1680 | deleteMirrorDistroArchSeries | ||
| 43 | 1681 | ensureMirrorDistroArchSeries | ||
| 44 | 1682 | ensureMirrorDistroSeriesSource | ||
| 45 | 1683 | deleteMirrorDistroSeriesSource | ||
| 46 | 1684 | ensureMirrorCDImageSeries | ||
| 47 | 1685 | deleteMirrorCDImageSeries | ||
| 48 | 1686 | deleteAllMirrorCDImageSeries | ||
| 49 | 1687 | getExpectedPackagesPaths | ||
| 50 | 1688 | getExpectedSourcesPaths | ||
| 51 | 1689 | canTransitionToCountryMirror" /> | ||
| 52 | 1648 | <require | 1690 | <require |
| 53 | 1649 | permission="launchpad.Edit" | 1691 | permission="launchpad.Edit" |
| 54 | 1650 | interface="lp.registry.interfaces.distributionmirror.IDistributionMirrorEditRestricted" | ||
| 55 | 1651 | set_attributes="name displayname description whiteboard | 1692 | set_attributes="name displayname description whiteboard |
| 56 | 1652 | http_base_url ftp_base_url rsync_base_url enabled | 1693 | http_base_url ftp_base_url rsync_base_url enabled |
| 58 | 1653 | speed country content official_candidate owner" /> | 1694 | speed country content official_candidate owner" |
| 59 | 1695 | attributes="official_candidate whiteboard" /> | ||
| 60 | 1654 | <require | 1696 | <require |
| 61 | 1655 | permission="launchpad.Admin" | 1697 | permission="launchpad.Admin" |
| 62 | 1656 | interface="lp.registry.interfaces.distributionmirror.IDistributionMirrorAdminRestricted" | ||
| 63 | 1657 | set_attributes="status reviewer date_reviewed" | 1698 | set_attributes="status reviewer date_reviewed" |
| 65 | 1658 | attributes="destroySelf" /> | 1699 | attributes="reviewer date_reviewed destroySelf |
| 66 | 1700 | transitionToCountryMirror" /> | ||
| 67 | 1659 | </class> | 1701 | </class> |
| 68 | 1660 | 1702 | ||
| 69 | 1661 | <adapter | 1703 | <adapter |
| 70 | 1662 | 1704 | ||
| 71 | === modified file 'lib/lp/registry/doc/distribution-mirror.txt' | |||
| 72 | --- lib/lp/registry/doc/distribution-mirror.txt 2009-12-09 10:03:20 +0000 | |||
| 73 | +++ lib/lp/registry/doc/distribution-mirror.txt 2010-03-31 15:03:35 +0000 | |||
| 74 | @@ -8,7 +8,7 @@ | |||
| 75 | 8 | >>> from canonical.launchpad.interfaces import ( | 8 | >>> from canonical.launchpad.interfaces import ( |
| 76 | 9 | ... ICountrySet, IDistributionSet, IDistributionMirrorSet, | 9 | ... ICountrySet, IDistributionSet, IDistributionMirrorSet, |
| 77 | 10 | ... IDistroArchSeriesSet, IDistroSeriesSet, ILibraryFileAliasSet, | 10 | ... IDistroArchSeriesSet, IDistroSeriesSet, ILibraryFileAliasSet, |
| 79 | 11 | ... IPersonSet, MirrorContent, MirrorSpeed) | 11 | ... IPersonSet, MirrorContent, MirrorSpeed, MirrorStatus) |
| 80 | 12 | >>> from lp.registry.interfaces.pocket import PackagePublishingPocket | 12 | >>> from lp.registry.interfaces.pocket import PackagePublishingPocket |
| 81 | 13 | >>> mirrorset = getUtility(IDistributionMirrorSet) | 13 | >>> mirrorset = getUtility(IDistributionMirrorSet) |
| 82 | 14 | >>> distroset = getUtility(IDistributionSet) | 14 | >>> distroset = getUtility(IDistributionSet) |
| 83 | @@ -814,3 +814,121 @@ | |||
| 84 | 814 | >>> mirrorset.getByName('invalid-mirror') is None | 814 | >>> mirrorset.getByName('invalid-mirror') is None |
| 85 | 815 | True | 815 | True |
| 86 | 816 | 816 | ||
| 87 | 817 | Country DNS mirrors | ||
| 88 | 818 | ------------------- | ||
| 89 | 819 | |||
| 90 | 820 | Country DNS mirrors are mirrors which have been assigned | ||
| 91 | 821 | $CC.archive.ubuntu.com or $CC.releases.ubuntu.com. These assignments are | ||
| 92 | 822 | tracked in Launchpad. | ||
| 93 | 823 | |||
| 94 | 824 | >>> login('admin@canonical.com') | ||
| 95 | 825 | >>> ubuntu_distro = getUtility(IDistributionSet).getByName('ubuntu') | ||
| 96 | 826 | >>> de_archive_mirror = factory.makeMirror(ubuntu_distro, | ||
| 97 | 827 | ... "Technische Universitaet Dresden", country=82, | ||
| 98 | 828 | ... http_url="http://ubuntu.mirror.tudos.de/ubuntu/", | ||
| 99 | 829 | ... official_candidate=True) | ||
| 100 | 830 | >>> davis_station_archive = factory.makeMirror(ubuntu_distro, | ||
| 101 | 831 | ... "Davis Station", country=9, | ||
| 102 | 832 | ... http_url="http://mirror.davis.antarctica.org/ubuntu", | ||
| 103 | 833 | ... official_candidate=True) | ||
| 104 | 834 | >>> de_archive_mirror.status = MirrorStatus.OFFICIAL | ||
| 105 | 835 | >>> de_archive_prober_log = factory.makeMirrorProbeRecord(de_archive_mirror) | ||
| 106 | 836 | >>> logout() | ||
| 107 | 837 | |||
| 108 | 838 | Normal users can access country_dns_mirror, can see if a mirror is eligible | ||
| 109 | 839 | for the status, however, they may not change it: | ||
| 110 | 840 | |||
| 111 | 841 | >>> login('test@canonical.com') | ||
| 112 | 842 | >>> de_archive_mirror.canTransitionToCountryMirror() | ||
| 113 | 843 | True | ||
| 114 | 844 | >>> de_archive_mirror.transitionToCountryMirror(True) | ||
| 115 | 845 | Traceback (most recent call last): | ||
| 116 | 846 | ... | ||
| 117 | 847 | Unauthorized: (<DistributionMirror at ...>, 'transitionToCountryMirror', | ||
| 118 | 848 | 'launchpad.Admin') | ||
| 119 | 849 | >>> logout() | ||
| 120 | 850 | |||
| 121 | 851 | Mirror listing administrators may change the status however: | ||
| 122 | 852 | |||
| 123 | 853 | >>> login('karl@canonical.com') | ||
| 124 | 854 | >>> de_archive_mirror.transitionToCountryMirror(True) | ||
| 125 | 855 | |||
| 126 | 856 | Mirrors which are already set as country mirrors can't be 'set' as such | ||
| 127 | 857 | again: | ||
| 128 | 858 | |||
| 129 | 859 | >>> de_archive_mirror.canTransitionToCountryMirror() | ||
| 130 | 860 | False | ||
| 131 | 861 | >>> de_archive_mirror.transitionToCountryMirror(True) | ||
| 132 | 862 | >>> logout() | ||
| 133 | 863 | |||
| 134 | 864 | There cannot be multiple country mirrors of one type for one country: | ||
| 135 | 865 | |||
| 136 | 866 | >>> login('karl@canonical.com') | ||
| 137 | 867 | >>> proberecord = factory.makeMirrorProbeRecord(davis_station_archive) | ||
| 138 | 868 | |||
| 139 | 869 | >>> print davis_station_archive.content.name | ||
| 140 | 870 | ARCHIVE | ||
| 141 | 871 | >>> print davis_station_archive.country_dns_mirror | ||
| 142 | 872 | False | ||
| 143 | 873 | >>> print davis_station_archive.country.name | ||
| 144 | 874 | Antarctica | ||
| 145 | 875 | |||
| 146 | 876 | >>> archive_mirror2 = getUtility(IDistributionMirrorSet).getByName( | ||
| 147 | 877 | ... 'archive-mirror2') | ||
| 148 | 878 | >>> print archive_mirror2.content.name | ||
| 149 | 879 | ARCHIVE | ||
| 150 | 880 | >>> print archive_mirror2.country_dns_mirror | ||
| 151 | 881 | False | ||
| 152 | 882 | >>> print archive_mirror2.country.name | ||
| 153 | 883 | Antarctica | ||
| 154 | 884 | |||
| 155 | 885 | >>> davis_station_archive.status = MirrorStatus.OFFICIAL | ||
| 156 | 886 | |||
| 157 | 887 | >>> davis_station_archive.transitionToCountryMirror(True) | ||
| 158 | 888 | >>> archive_mirror2.transitionToCountryMirror(True) | ||
| 159 | 889 | Traceback (most recent call last): | ||
| 160 | 890 | ... | ||
| 161 | 891 | CountryMirrorAlreadySet: Antarctica already has a country Archive mirror | ||
| 162 | 892 | set. | ||
| 163 | 893 | |||
| 164 | 894 | Mirrors which have not been probed may not be marked as country mirrors: | ||
| 165 | 895 | |||
| 166 | 896 | >>> linux_au_mirror = factory.makeMirror(ubuntu_distro, | ||
| 167 | 897 | ... "Linux.org.au", country=14, | ||
| 168 | 898 | ... http_url="http://mirror.linux.org.au/ubuntu", | ||
| 169 | 899 | ... official_candidate=True) | ||
| 170 | 900 | >>> linux_au_mirror.status = MirrorStatus.OFFICIAL | ||
| 171 | 901 | >>> linux_au_mirror.transitionToCountryMirror(True) | ||
| 172 | 902 | Traceback (most recent call last): | ||
| 173 | 903 | ... | ||
| 174 | 904 | MirrorNotProbed: This mirror may not be set as a country mirror as it has | ||
| 175 | 905 | not been probed. | ||
| 176 | 906 | >>> logout() | ||
| 177 | 907 | |||
| 178 | 908 | Mirrors which are not official or do not have an HTTP URL may not be set as | ||
| 179 | 909 | country mirrors: | ||
| 180 | 910 | |||
| 181 | 911 | >>> login('admin@canonical.com') | ||
| 182 | 912 | >>> osuosl_mirror = factory.makeMirror(ubuntu_distro, | ||
| 183 | 913 | ... "OSU Open Source Lab", country=226, | ||
| 184 | 914 | ... ftp_url="ftp://ubuntu.osuosl.org/pub/ubuntu/", | ||
| 185 | 915 | ... official_candidate=True) | ||
| 186 | 916 | >>> osuosl_mirror.status = MirrorStatus.OFFICIAL | ||
| 187 | 917 | >>> print osuosl_mirror.http_base_url | ||
| 188 | 918 | None | ||
| 189 | 919 | |||
| 190 | 920 | >>> osuosl_mirror.canTransitionToCountryMirror() | ||
| 191 | 921 | False | ||
| 192 | 922 | |||
| 193 | 923 | >>> osuosl_mirror.transitionToCountryMirror(None) | ||
| 194 | 924 | Traceback (most recent call last): | ||
| 195 | 925 | ... | ||
| 196 | 926 | NoneError: None isn't acceptable as a value for | ||
| 197 | 927 | DistributionMirror.country_dns_mirror | ||
| 198 | 928 | |||
| 199 | 929 | >>> osuosl_mirror.transitionToCountryMirror(True) | ||
| 200 | 930 | Traceback (most recent call last): | ||
| 201 | 931 | ... | ||
| 202 | 932 | MirrorHasNoHTTPURL: This mirror may not be set as a country mirror as it | ||
| 203 | 933 | does not have an HTTP URL set. | ||
| 204 | 934 | >>> logout() | ||
| 205 | 817 | 935 | ||
| 206 | === modified file 'lib/lp/registry/interfaces/distribution.py' | |||
| 207 | --- lib/lp/registry/interfaces/distribution.py 2010-03-24 21:59:58 +0000 | |||
| 208 | +++ lib/lp/registry/interfaces/distribution.py 2010-03-31 15:03:35 +0000 | |||
| 209 | @@ -25,7 +25,7 @@ | |||
| 210 | 25 | 25 | ||
| 211 | 26 | from lazr.restful.fields import CollectionField, Reference | 26 | from lazr.restful.fields import CollectionField, Reference |
| 212 | 27 | from lazr.restful.declarations import ( | 27 | from lazr.restful.declarations import ( |
| 214 | 28 | collection_default_content, export_as_webservice_collection, | 28 | collection_default_content, copy_field, export_as_webservice_collection, |
| 215 | 29 | export_as_webservice_entry, export_operation_as, | 29 | export_as_webservice_entry, export_operation_as, |
| 216 | 30 | export_read_operation, exported, operation_parameters, | 30 | export_read_operation, exported, operation_parameters, |
| 217 | 31 | operation_returns_collection_of, operation_returns_entry, | 31 | operation_returns_collection_of, operation_returns_entry, |
| 218 | @@ -321,6 +321,14 @@ | |||
| 219 | 321 | if it's not found. | 321 | if it's not found. |
| 220 | 322 | """ | 322 | """ |
| 221 | 323 | 323 | ||
| 222 | 324 | @operation_parameters( | ||
| 223 | 325 | country=copy_field(IDistributionMirror['country'], required=True), | ||
| 224 | 326 | mirror_type=copy_field(IDistributionMirror['content'], required=True)) | ||
| 225 | 327 | @operation_returns_entry(IDistributionMirror) | ||
| 226 | 328 | @export_read_operation() | ||
| 227 | 329 | def getCountryMirror(country, mirror_type): | ||
| 228 | 330 | """Return the country DNS mirror for a country and content type.""" | ||
| 229 | 331 | |||
| 230 | 324 | def newMirror(owner, speed, country, content, displayname=None, | 332 | def newMirror(owner, speed, country, content, displayname=None, |
| 231 | 325 | description=None, http_base_url=None, | 333 | description=None, http_base_url=None, |
| 232 | 326 | ftp_base_url=None, rsync_base_url=None, enabled=False, | 334 | ftp_base_url=None, rsync_base_url=None, enabled=False, |
| 233 | 327 | 335 | ||
| 234 | === modified file 'lib/lp/registry/interfaces/distributionmirror.py' | |||
| 235 | --- lib/lp/registry/interfaces/distributionmirror.py 2010-02-22 15:50:06 +0000 | |||
| 236 | +++ lib/lp/registry/interfaces/distributionmirror.py 2010-03-31 15:03:35 +0000 | |||
| 237 | @@ -6,21 +6,24 @@ | |||
| 238 | 6 | __metaclass__ = type | 6 | __metaclass__ = type |
| 239 | 7 | 7 | ||
| 240 | 8 | __all__ = [ | 8 | __all__ = [ |
| 256 | 9 | 'IDistributionMirror', | 9 | 'CannotTransitionToCountryMirror', |
| 257 | 10 | 'IDistributionMirrorAdminRestricted', | 10 | 'CountryMirrorAlreadySet', |
| 258 | 11 | 'IDistributionMirrorEditRestricted', | 11 | 'IDistributionMirror', |
| 259 | 12 | 'IDistributionMirrorPublic', | 12 | 'IMirrorDistroArchSeries', |
| 260 | 13 | 'IMirrorDistroArchSeries', | 13 | 'IMirrorDistroSeriesSource', |
| 261 | 14 | 'IMirrorDistroSeriesSource', | 14 | 'IMirrorProbeRecord', |
| 262 | 15 | 'IMirrorProbeRecord', | 15 | 'IDistributionMirrorSet', |
| 263 | 16 | 'IDistributionMirrorSet', | 16 | 'IMirrorCDImageDistroSeries', |
| 264 | 17 | 'IMirrorCDImageDistroSeries', | 17 | 'PROBE_INTERVAL', |
| 265 | 18 | 'PROBE_INTERVAL', | 18 | 'MirrorContent', |
| 266 | 19 | 'UnableToFetchCDImageFileList', | 19 | 'MirrorFreshness', |
| 267 | 20 | 'MirrorContent', | 20 | 'MirrorHasNoHTTPURL', |
| 268 | 21 | 'MirrorFreshness', | 21 | 'MirrorNotOfficial', |
| 269 | 22 | 'MirrorSpeed', | 22 | 'MirrorNotProbed', |
| 270 | 23 | 'MirrorStatus'] | 23 | 'MirrorSpeed', |
| 271 | 24 | 'MirrorStatus', | ||
| 272 | 25 | 'UnableToFetchCDImageFileList', | ||
| 273 | 26 | ] | ||
| 274 | 24 | 27 | ||
| 275 | 25 | from cgi import escape | 28 | from cgi import escape |
| 276 | 26 | 29 | ||
| 277 | @@ -31,8 +34,11 @@ | |||
| 278 | 31 | from zope.component import getUtility | 34 | from zope.component import getUtility |
| 279 | 32 | from lazr.enum import DBEnumeratedType, DBItem | 35 | from lazr.enum import DBEnumeratedType, DBItem |
| 280 | 33 | from lazr.restful.declarations import ( | 36 | from lazr.restful.declarations import ( |
| 282 | 34 | export_as_webservice_entry, export_read_operation, exported) | 37 | export_as_webservice_entry, export_read_operation, |
| 283 | 38 | export_write_operation, exported, mutator_for, operation_parameters, | ||
| 284 | 39 | webservice_error) | ||
| 285 | 35 | from lazr.restful.fields import Reference, ReferenceChoice | 40 | from lazr.restful.fields import Reference, ReferenceChoice |
| 286 | 41 | from lazr.restful.interface import copy_field | ||
| 287 | 36 | 42 | ||
| 288 | 37 | from canonical.launchpad import _ | 43 | from canonical.launchpad import _ |
| 289 | 38 | from canonical.launchpad.fields import ( | 44 | from canonical.launchpad.fields import ( |
| 290 | @@ -47,6 +53,43 @@ | |||
| 291 | 47 | PROBE_INTERVAL = 23 | 53 | PROBE_INTERVAL = 23 |
| 292 | 48 | 54 | ||
| 293 | 49 | 55 | ||
| 294 | 56 | class CannotTransitionToCountryMirror(Exception): | ||
| 295 | 57 | """Root exception for transitions to country mirrors.""" | ||
| 296 | 58 | webservice_error(400) | ||
| 297 | 59 | |||
| 298 | 60 | |||
| 299 | 61 | class CountryMirrorAlreadySet(CannotTransitionToCountryMirror): | ||
| 300 | 62 | """Distribution mirror cannot be set as a country mirror. | ||
| 301 | 63 | |||
| 302 | 64 | Raised when a user tries to change set a distribution mirror as a country | ||
| 303 | 65 | mirror, however there is already one set for that country. | ||
| 304 | 66 | """ | ||
| 305 | 67 | |||
| 306 | 68 | |||
| 307 | 69 | class MirrorNotOfficial(CannotTransitionToCountryMirror): | ||
| 308 | 70 | """Distribution mirror is not permitted to become a country mirror. | ||
| 309 | 71 | |||
| 310 | 72 | Raised when a user tries to change set a distribution mirror as a country | ||
| 311 | 73 | mirror, however the mirror in question is not official. | ||
| 312 | 74 | """ | ||
| 313 | 75 | |||
| 314 | 76 | |||
| 315 | 77 | class MirrorHasNoHTTPURL(CannotTransitionToCountryMirror): | ||
| 316 | 78 | """Distribution mirror has no HTTP URL. | ||
| 317 | 79 | |||
| 318 | 80 | Raised when a user tries to make an official mirror a country mirror, | ||
| 319 | 81 | however the mirror has not HTTP URL set. | ||
| 320 | 82 | """ | ||
| 321 | 83 | |||
| 322 | 84 | |||
| 323 | 85 | class MirrorNotProbed(CannotTransitionToCountryMirror): | ||
| 324 | 86 | """Distribution mirror has not been probed. | ||
| 325 | 87 | |||
| 326 | 88 | Raised when a user tries to set an official mirror as a country mirror, | ||
| 327 | 89 | however the mirror has not been probed yet. | ||
| 328 | 90 | """ | ||
| 329 | 91 | |||
| 330 | 92 | |||
| 331 | 50 | class MirrorContent(DBEnumeratedType): | 93 | class MirrorContent(DBEnumeratedType): |
| 332 | 51 | """The content that is mirrored.""" | 94 | """The content that is mirrored.""" |
| 333 | 52 | 95 | ||
| 334 | @@ -284,33 +327,10 @@ | |||
| 335 | 284 | def getMirrorByURI(self, url): | 327 | def getMirrorByURI(self, url): |
| 336 | 285 | return getUtility(IDistributionMirrorSet).getByRsyncUrl(url) | 328 | return getUtility(IDistributionMirrorSet).getByRsyncUrl(url) |
| 337 | 286 | 329 | ||
| 365 | 287 | class IDistributionMirrorAdminRestricted(Interface): | 330 | |
| 366 | 288 | """IDistributionMirror properties requiring launchpad.Admin permission.""" | 331 | class IDistributionMirror(Interface): |
| 367 | 289 | 332 | """A mirror of a given distribution.""" | |
| 368 | 290 | reviewer = exported(PublicPersonChoice( | 333 | export_as_webservice_entry() |
| 342 | 291 | title=_('Reviewer'), required=False, readonly=True, | ||
| 343 | 292 | vocabulary='ValidPersonOrTeam', description=_( | ||
| 344 | 293 | "The person who last reviewed this mirror."))) | ||
| 345 | 294 | date_reviewed = exported(Datetime( | ||
| 346 | 295 | title=_('Date reviewed'), required=False, readonly=True, | ||
| 347 | 296 | description=_( | ||
| 348 | 297 | "The date on which this mirror was last reviewed by a mirror admin."))) | ||
| 349 | 298 | |||
| 350 | 299 | |||
| 351 | 300 | class IDistributionMirrorEditRestricted(Interface): | ||
| 352 | 301 | """IDistributionMirror properties requiring launchpad.Edit permission.""" | ||
| 353 | 302 | |||
| 354 | 303 | official_candidate = exported(Bool( | ||
| 355 | 304 | title=_('Apply to be an official mirror of this distribution'), | ||
| 356 | 305 | required=False, readonly=False, default=True)) | ||
| 357 | 306 | whiteboard = exported(Whiteboard( | ||
| 358 | 307 | title=_('Whiteboard'), required=False, readonly=False, | ||
| 359 | 308 | description=_("Notes on the current status of the mirror (only " | ||
| 360 | 309 | "visible to admins and the mirror's registrant)."))) | ||
| 361 | 310 | |||
| 362 | 311 | |||
| 363 | 312 | class IDistributionMirrorPublic(Interface): | ||
| 364 | 313 | """Public IDistributionMirror properties.""" | ||
| 369 | 314 | 334 | ||
| 370 | 315 | id = Int(title=_('The unique id'), required=True, readonly=True) | 335 | id = Int(title=_('The unique id'), required=True, readonly=True) |
| 371 | 316 | owner = exported(PublicPersonChoice( | 336 | owner = exported(PublicPersonChoice( |
| 372 | @@ -386,6 +406,39 @@ | |||
| 373 | 386 | date_created = exported(Datetime( | 406 | date_created = exported(Datetime( |
| 374 | 387 | title=_('Date Created'), required=True, readonly=True, | 407 | title=_('Date Created'), required=True, readonly=True, |
| 375 | 388 | description=_("The date on which this mirror was registered."))) | 408 | description=_("The date on which this mirror was registered."))) |
| 376 | 409 | country_dns_mirror = exported(Bool( | ||
| 377 | 410 | title=_('Country DNS Mirror'), | ||
| 378 | 411 | description=_('Whether this is a country mirror in DNS.'), | ||
| 379 | 412 | required=False, readonly=True, default=False)) | ||
| 380 | 413 | |||
| 381 | 414 | reviewer = exported(PublicPersonChoice( | ||
| 382 | 415 | title=_('Reviewer'), required=False, readonly=True, | ||
| 383 | 416 | vocabulary='ValidPersonOrTeam', description=_( | ||
| 384 | 417 | "The person who last reviewed this mirror."))) | ||
| 385 | 418 | date_reviewed = exported(Datetime( | ||
| 386 | 419 | title=_('Date reviewed'), required=False, readonly=True, | ||
| 387 | 420 | description=_( | ||
| 388 | 421 | "The date on which this mirror was last reviewed by a mirror " | ||
| 389 | 422 | "admin."))) | ||
| 390 | 423 | |||
| 391 | 424 | official_candidate = exported(Bool( | ||
| 392 | 425 | title=_('Apply to be an official mirror of this distribution'), | ||
| 393 | 426 | required=False, readonly=False, default=True)) | ||
| 394 | 427 | whiteboard = exported(Whiteboard( | ||
| 395 | 428 | title=_('Whiteboard'), required=False, readonly=False, | ||
| 396 | 429 | description=_("Notes on the current status of the mirror (only " | ||
| 397 | 430 | "visible to admins and the mirror's registrant)."))) | ||
| 398 | 431 | |||
| 399 | 432 | @export_read_operation() | ||
| 400 | 433 | def canTransitionToCountryMirror(): | ||
| 401 | 434 | """Verify if a mirror can be set as a country mirror or return | ||
| 402 | 435 | False.""" | ||
| 403 | 436 | |||
| 404 | 437 | @mutator_for(country_dns_mirror) | ||
| 405 | 438 | @operation_parameters(country_dns_mirror=copy_field(country_dns_mirror)) | ||
| 406 | 439 | @export_write_operation() | ||
| 407 | 440 | def transitionToCountryMirror(country_dns_mirror): | ||
| 408 | 441 | """Method run on changing country_dns_mirror.""" | ||
| 409 | 389 | 442 | ||
| 410 | 390 | @invariant | 443 | @invariant |
| 411 | 391 | def mirrorMustHaveHTTPOrFTPURL(mirror): | 444 | def mirrorMustHaveHTTPOrFTPURL(mirror): |
| 412 | @@ -521,10 +574,6 @@ | |||
| 413 | 521 | Sources.gz file refer to and the path to the file itself. | 574 | Sources.gz file refer to and the path to the file itself. |
| 414 | 522 | """ | 575 | """ |
| 415 | 523 | 576 | ||
| 416 | 524 | class IDistributionMirror(IDistributionMirrorAdminRestricted, | ||
| 417 | 525 | IDistributionMirrorEditRestricted, IDistributionMirrorPublic): | ||
| 418 | 526 | """A mirror of a given distribution.""" | ||
| 419 | 527 | export_as_webservice_entry() | ||
| 420 | 528 | 577 | ||
| 421 | 529 | 578 | ||
| 422 | 530 | class UnableToFetchCDImageFileList(Exception): | 579 | class UnableToFetchCDImageFileList(Exception): |
| 423 | 531 | 580 | ||
| 424 | === modified file 'lib/lp/registry/model/distribution.py' | |||
| 425 | --- lib/lp/registry/model/distribution.py 2010-03-24 02:53:42 +0000 | |||
| 426 | +++ lib/lp/registry/model/distribution.py 2010-03-31 15:03:35 +0000 | |||
| 427 | @@ -402,6 +402,17 @@ | |||
| 428 | 402 | """See `IDistribution`.""" | 402 | """See `IDistribution`.""" |
| 429 | 403 | return DistributionMirror.selectOneBy(distribution=self, name=name) | 403 | return DistributionMirror.selectOneBy(distribution=self, name=name) |
| 430 | 404 | 404 | ||
| 431 | 405 | def getCountryMirror(self, country, mirror_type): | ||
| 432 | 406 | """See `IDistribution`.""" | ||
| 433 | 407 | store = Store.of(self) | ||
| 434 | 408 | results = store.find( | ||
| 435 | 409 | DistributionMirror, | ||
| 436 | 410 | DistributionMirror.distribution == self, | ||
| 437 | 411 | DistributionMirror.country == country, | ||
| 438 | 412 | DistributionMirror.content == mirror_type, | ||
| 439 | 413 | DistributionMirror.country_dns_mirror == True) | ||
| 440 | 414 | return results.one() | ||
| 441 | 415 | |||
| 442 | 405 | def newMirror(self, owner, speed, country, content, displayname=None, | 416 | def newMirror(self, owner, speed, country, content, displayname=None, |
| 443 | 406 | description=None, http_base_url=None, | 417 | description=None, http_base_url=None, |
| 444 | 407 | ftp_base_url=None, rsync_base_url=None, | 418 | ftp_base_url=None, rsync_base_url=None, |
| 445 | 408 | 419 | ||
| 446 | === modified file 'lib/lp/registry/model/distributionmirror.py' | |||
| 447 | --- lib/lp/registry/model/distributionmirror.py 2010-03-23 20:42:23 +0000 | |||
| 448 | +++ lib/lp/registry/model/distributionmirror.py 2010-03-31 15:03:35 +0000 | |||
| 449 | @@ -45,9 +45,11 @@ | |||
| 450 | 45 | from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities | 45 | from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities |
| 451 | 46 | from lp.soyuz.interfaces.publishing import PackagePublishingStatus | 46 | from lp.soyuz.interfaces.publishing import PackagePublishingStatus |
| 452 | 47 | from lp.registry.interfaces.distributionmirror import ( | 47 | from lp.registry.interfaces.distributionmirror import ( |
| 453 | 48 | CannotTransitionToCountryMirror, CountryMirrorAlreadySet, | ||
| 454 | 48 | IDistributionMirror, IDistributionMirrorSet, IMirrorCDImageDistroSeries, | 49 | IDistributionMirror, IDistributionMirrorSet, IMirrorCDImageDistroSeries, |
| 455 | 49 | IMirrorDistroArchSeries, IMirrorDistroSeriesSource, IMirrorProbeRecord, | 50 | IMirrorDistroArchSeries, IMirrorDistroSeriesSource, IMirrorProbeRecord, |
| 457 | 50 | MirrorContent, MirrorFreshness, MirrorSpeed, MirrorStatus, PROBE_INTERVAL) | 51 | MirrorContent, MirrorFreshness, MirrorHasNoHTTPURL, MirrorNotOfficial, |
| 458 | 52 | MirrorNotProbed, MirrorSpeed, MirrorStatus, PROBE_INTERVAL) | ||
| 459 | 51 | from lp.registry.interfaces.distroseries import IDistroSeries | 53 | from lp.registry.interfaces.distroseries import IDistroSeries |
| 460 | 52 | from lp.registry.interfaces.sourcepackage import SourcePackageFileType | 54 | from lp.registry.interfaces.sourcepackage import SourcePackageFileType |
| 461 | 53 | from canonical.launchpad.mail import simple_sendmail, format_address | 55 | from canonical.launchpad.mail import simple_sendmail, format_address |
| 462 | @@ -100,6 +102,8 @@ | |||
| 463 | 100 | date_reviewed = UtcDateTimeCol(default=None) | 102 | date_reviewed = UtcDateTimeCol(default=None) |
| 464 | 101 | whiteboard = StringCol( | 103 | whiteboard = StringCol( |
| 465 | 102 | notNull=False, default=None) | 104 | notNull=False, default=None) |
| 466 | 105 | country_dns_mirror = BoolCol( | ||
| 467 | 106 | notNull=True, default=False) | ||
| 468 | 103 | 107 | ||
| 469 | 104 | @property | 108 | @property |
| 470 | 105 | def base_url(self): | 109 | def base_url(self): |
| 471 | @@ -145,6 +149,64 @@ | |||
| 472 | 145 | "This mirror has been probed and thus can't be removed.") | 149 | "This mirror has been probed and thus can't be removed.") |
| 473 | 146 | SQLBase.destroySelf(self) | 150 | SQLBase.destroySelf(self) |
| 474 | 147 | 151 | ||
| 475 | 152 | def verifyTransitionToCountryMirror(self): | ||
| 476 | 153 | """Verify that a mirror can be set as a country mirror. | ||
| 477 | 154 | |||
| 478 | 155 | Return True if valid, otherwise raise a subclass of | ||
| 479 | 156 | CannotTransitionToCountryMirror. | ||
| 480 | 157 | """ | ||
| 481 | 158 | |||
| 482 | 159 | current_country_mirror = self.distribution.getCountryMirror( | ||
| 483 | 160 | self.country, self.content) | ||
| 484 | 161 | |||
| 485 | 162 | if current_country_mirror is not None: | ||
| 486 | 163 | # Country already has a country mirror. | ||
| 487 | 164 | raise CountryMirrorAlreadySet( | ||
| 488 | 165 | "%s already has a country %s mirror set." % ( | ||
| 489 | 166 | self.country.name, self.content)) | ||
| 490 | 167 | |||
| 491 | 168 | if not self.isOfficial(): | ||
| 492 | 169 | # Only official mirrors may be set as country mirrors. | ||
| 493 | 170 | raise MirrorNotOfficial( | ||
| 494 | 171 | "This mirror may not be set as a country mirror as it is not " | ||
| 495 | 172 | "an official mirror.") | ||
| 496 | 173 | |||
| 497 | 174 | if self.http_base_url is None: | ||
| 498 | 175 | # Country mirrors must have HTTP URLs set. | ||
| 499 | 176 | raise MirrorHasNoHTTPURL( | ||
| 500 | 177 | "This mirror may not be set as a country mirror as it does " | ||
| 501 | 178 | "not have an HTTP URL set.") | ||
| 502 | 179 | |||
| 503 | 180 | if not self.last_probe_record: | ||
| 504 | 181 | # Only mirrors which have been probed may be set as country | ||
| 505 | 182 | # mirrors. | ||
| 506 | 183 | raise MirrorNotProbed( | ||
| 507 | 184 | "This mirror may not be set as a country mirror as it has " | ||
| 508 | 185 | "not been probed.") | ||
| 509 | 186 | |||
| 510 | 187 | # Verification done. | ||
| 511 | 188 | return True | ||
| 512 | 189 | |||
| 513 | 190 | def canTransitionToCountryMirror(self): | ||
| 514 | 191 | """See `IDistributionMirror`.""" | ||
| 515 | 192 | try: | ||
| 516 | 193 | return self.verifyTransitionToCountryMirror() | ||
| 517 | 194 | except CannotTransitionToCountryMirror: | ||
| 518 | 195 | return False | ||
| 519 | 196 | |||
| 520 | 197 | def transitionToCountryMirror(self, country_dns_mirror): | ||
| 521 | 198 | """See `IDistributionMirror`.""" | ||
| 522 | 199 | |||
| 523 | 200 | # country_dns_mirror has not been changed, do nothing. | ||
| 524 | 201 | if self.country_dns_mirror == country_dns_mirror: | ||
| 525 | 202 | return | ||
| 526 | 203 | |||
| 527 | 204 | # Environment sanity checks. | ||
| 528 | 205 | if country_dns_mirror: | ||
| 529 | 206 | self.verifyTransitionToCountryMirror() | ||
| 530 | 207 | |||
| 531 | 208 | self.country_dns_mirror = country_dns_mirror | ||
| 532 | 209 | |||
| 533 | 148 | def getOverallFreshness(self): | 210 | def getOverallFreshness(self): |
| 534 | 149 | """See IDistributionMirror""" | 211 | """See IDistributionMirror""" |
| 535 | 150 | # XXX Guilherme Salgado 2006-08-16: | 212 | # XXX Guilherme Salgado 2006-08-16: |
| 536 | 151 | 213 | ||
| 537 | === modified file 'lib/lp/registry/stories/distributionmirror/xx-distribution-mirrors.txt' | |||
| 538 | --- lib/lp/registry/stories/distributionmirror/xx-distribution-mirrors.txt 2009-12-10 23:32:13 +0000 | |||
| 539 | +++ lib/lp/registry/stories/distributionmirror/xx-distribution-mirrors.txt 2010-03-31 15:03:35 +0000 | |||
| 540 | @@ -40,13 +40,14 @@ | |||
| 541 | 40 | >>> print browser.title | 40 | >>> print browser.title |
| 542 | 41 | Mirrors of Ubuntu Linux... | 41 | Mirrors of Ubuntu Linux... |
| 543 | 42 | >>> print_mirrors_by_countries(browser.contents) | 42 | >>> print_mirrors_by_countries(browser.contents) |
| 546 | 43 | Antarctica: | 43 | Antarctica: [(u'Archive-mirror2', u'http', u'128 Kbps', |
| 547 | 44 | [(u'Archive-mirror2', u'http', u'128 Kbps', u'Six hours behind')] | 44 | u'Six hours behind')] |
| 548 | 45 | France: | 45 | France: |
| 549 | 46 | [(u'Archive-404-mirror', u'http', u'512 Kbps', u'Last update unknown'), | 46 | [(u'Archive-404-mirror', u'http', u'512 Kbps', u'Last update unknown'), |
| 553 | 47 | (u'Archive-mirror', u'http', u'128 Kbps', u'Last update unknown')] | 47 | (u'Archive-mirror', u'http', u'128 Kbps', u'Last update unknown')] |
| 554 | 48 | United Kingdom: | 48 | United Kingdom: [(u'Canonical-archive', u'http', u'100 Mbps', |
| 555 | 49 | [(u'Canonical-archive', u'http', u'100 Mbps', u'Last update unknown')] | 49 | u'Last update unknown')] |
| 556 | 50 | |||
| 557 | 50 | >>> find_tags_by_class(browser.contents, 'distromirrorstatusSIXHOURSBEHIND') | 51 | >>> find_tags_by_class(browser.contents, 'distromirrorstatusSIXHOURSBEHIND') |
| 558 | 51 | [<span class="distromirrorstatusSIXHOURSBEHIND">Six hours behind</span>] | 52 | [<span class="distromirrorstatusSIXHOURSBEHIND">Six hours behind</span>] |
| 559 | 52 | >>> find_tags_by_class(browser.contents, 'distromirrorstatusUNKNOWN')[0] | 53 | >>> find_tags_by_class(browser.contents, 'distromirrorstatusUNKNOWN')[0] |
| 560 | @@ -59,13 +60,12 @@ | |||
| 561 | 59 | >>> browser.url | 60 | >>> browser.url |
| 562 | 60 | 'http://launchpad.dev/ubuntu/+cdmirrors' | 61 | 'http://launchpad.dev/ubuntu/+cdmirrors' |
| 563 | 61 | >>> print_mirrors_by_countries(browser.contents) | 62 | >>> print_mirrors_by_countries(browser.contents) |
| 566 | 62 | France: | 63 | France: |
| 567 | 63 | [(u'Releases-mirror', u'http', u'2 Mbps'), | 64 | [(u'Releases-mirror', u'http', u'2 Mbps'), |
| 568 | 64 | (u'Unreachable-mirror', u'http', u'512 Kbps')] | 65 | (u'Unreachable-mirror', u'http', u'512 Kbps')] |
| 573 | 65 | Germany: | 66 | Germany: [(u'Releases-mirror2', u'http', u'2 Mbps')] |
| 574 | 66 | [(u'Releases-mirror2', u'http', u'2 Mbps')] | 67 | United Kingdom: [(u'Canonical-releases', u'http', u'100 Mbps')] |
| 575 | 67 | United Kingdom: | 68 | |
| 572 | 68 | [(u'Canonical-releases', u'http', u'100 Mbps')] | ||
| 576 | 69 | 69 | ||
| 577 | 70 | === Disabled mirrors === | 70 | === Disabled mirrors === |
| 578 | 71 | 71 | ||
| 579 | 72 | 72 | ||
| 580 | === modified file 'lib/lp/registry/stories/webservice/xx-distribution-mirror.txt' | |||
| 581 | --- lib/lp/registry/stories/webservice/xx-distribution-mirror.txt 2010-02-23 19:40:45 +0000 | |||
| 582 | +++ lib/lp/registry/stories/webservice/xx-distribution-mirror.txt 2010-03-31 15:03:35 +0000 | |||
| 583 | @@ -8,10 +8,12 @@ | |||
| 584 | 8 | >>> distro = distros['entries'][0] | 8 | >>> distro = distros['entries'][0] |
| 585 | 9 | >>> ubuntu = webservice.get(distro['self_link']).jsonBody() | 9 | >>> ubuntu = webservice.get(distro['self_link']).jsonBody() |
| 586 | 10 | >>> ubuntu_archive_mirrors = webservice.get(ubuntu['archive_mirrors_collection_link']).jsonBody() | 10 | >>> ubuntu_archive_mirrors = webservice.get(ubuntu['archive_mirrors_collection_link']).jsonBody() |
| 590 | 11 | >>> canonical_archive = ubuntu_archive_mirrors['entries'][0] | 11 | >>> canonical_archive = webservice.named_get( |
| 591 | 12 | >>> canonical_archive_json = webservice.get(canonical_archive['self_link']).jsonBody() | 12 | ... ubuntu['self_link'], 'getMirrorByName', |
| 592 | 13 | >>> pprint_entry(canonical_archive_json) | 13 | ... name='canonical-archive').jsonBody() |
| 593 | 14 | >>> pprint_entry(canonical_archive) | ||
| 594 | 14 | content: u'Archive' | 15 | content: u'Archive' |
| 595 | 16 | country_dns_mirror: False | ||
| 596 | 15 | country_link: u'http://.../+countries/GB' | 17 | country_link: u'http://.../+countries/GB' |
| 597 | 16 | date_created: u'2006-10-16T18:31:43.434567+00:00' | 18 | date_created: u'2006-10-16T18:31:43.434567+00:00' |
| 598 | 17 | date_reviewed: None | 19 | date_reviewed: None |
| 599 | @@ -39,6 +41,7 @@ | |||
| 600 | 39 | >>> canonical_releases_json = webservice.get(canonical_releases['self_link']).jsonBody() | 41 | >>> canonical_releases_json = webservice.get(canonical_releases['self_link']).jsonBody() |
| 601 | 40 | >>> pprint_entry(canonical_releases_json) | 42 | >>> pprint_entry(canonical_releases_json) |
| 602 | 41 | content: u'CD Image' | 43 | content: u'CD Image' |
| 603 | 44 | country_dns_mirror: False | ||
| 604 | 42 | country_link: u'http://.../+countries/GB' | 45 | country_link: u'http://.../+countries/GB' |
| 605 | 43 | date_created: u'2006-10-16T18:31:43.434567+00:00' | 46 | date_created: u'2006-10-16T18:31:43.434567+00:00' |
| 606 | 44 | date_reviewed: None | 47 | date_reviewed: None |
| 607 | @@ -73,12 +76,12 @@ | |||
| 608 | 73 | >>> karl_db = getUtility(IPersonSet).getByName('karl') | 76 | >>> karl_db = getUtility(IPersonSet).getByName('karl') |
| 609 | 74 | >>> test_db = getUtility(IPersonSet).getByName('name12') | 77 | >>> test_db = getUtility(IPersonSet).getByName('name12') |
| 610 | 75 | >>> no_priv_db = getUtility(IPersonSet).getByName('no-priv') | 78 | >>> no_priv_db = getUtility(IPersonSet).getByName('no-priv') |
| 617 | 76 | >>> karl_webservice = webservice_for_person(karl_db, | 79 | >>> karl_webservice = webservice_for_person( |
| 618 | 77 | ... permission=OAuthPermission.WRITE_PUBLIC) | 80 | ... karl_db, permission=OAuthPermission.WRITE_PUBLIC) |
| 619 | 78 | >>> test_webservice = webservice_for_person(test_db, | 81 | >>> test_webservice = webservice_for_person( |
| 620 | 79 | ... permission=OAuthPermission.WRITE_PUBLIC) | 82 | ... test_db, permission=OAuthPermission.WRITE_PUBLIC) |
| 621 | 80 | >>> no_priv_webservice = webservice_for_person(no_priv_db, | 83 | >>> no_priv_webservice = webservice_for_person( |
| 622 | 81 | ... permission=OAuthPermission.READ_PUBLIC) | 84 | ... no_priv_db, permission=OAuthPermission.READ_PUBLIC) |
| 623 | 82 | >>> logout() | 85 | >>> logout() |
| 624 | 83 | 86 | ||
| 625 | 84 | Ensure that anonymous API sessions can view mirror listings; archive/releases. | 87 | Ensure that anonymous API sessions can view mirror listings; archive/releases. |
| 626 | @@ -97,7 +100,9 @@ | |||
| 627 | 97 | 100 | ||
| 628 | 98 | One must have special permissions to access certain attributes: | 101 | One must have special permissions to access certain attributes: |
| 629 | 99 | 102 | ||
| 631 | 100 | >>> archive_404_mirror = ubuntu_archive_mirrors['entries'][1] | 103 | >>> archive_404_mirror = webservice.named_get( |
| 632 | 104 | ... ubuntu['self_link'], 'getMirrorByName', | ||
| 633 | 105 | ... name="archive-404-mirror").jsonBody() | ||
| 634 | 101 | >>> response = no_priv_webservice.get( | 106 | >>> response = no_priv_webservice.get( |
| 635 | 102 | ... archive_404_mirror['self_link']).jsonBody() | 107 | ... archive_404_mirror['self_link']).jsonBody() |
| 636 | 103 | >>> pprint_entry(response) | 108 | >>> pprint_entry(response) |
| 637 | @@ -128,6 +133,7 @@ | |||
| 638 | 128 | ... archive_404_mirror['self_link']).jsonBody() | 133 | ... archive_404_mirror['self_link']).jsonBody() |
| 639 | 129 | >>> pprint_entry(response) | 134 | >>> pprint_entry(response) |
| 640 | 130 | content: u'Archive' | 135 | content: u'Archive' |
| 641 | 136 | country_dns_mirror: False | ||
| 642 | 131 | country_link: u'http://.../+countries/FR' | 137 | country_link: u'http://.../+countries/FR' |
| 643 | 132 | date_created: u'2006-10-16T18:31:43.438573+00:00' | 138 | date_created: u'2006-10-16T18:31:43.438573+00:00' |
| 644 | 133 | date_reviewed: None | 139 | date_reviewed: None |
| 645 | @@ -209,6 +215,7 @@ | |||
| 646 | 209 | ... canonical_releases['self_link'], 'application/json', dumps(patch)).jsonBody() | 215 | ... canonical_releases['self_link'], 'application/json', dumps(patch)).jsonBody() |
| 647 | 210 | >>> pprint_entry(response) | 216 | >>> pprint_entry(response) |
| 648 | 211 | content: u'CD Image' | 217 | content: u'CD Image' |
| 649 | 218 | country_dns_mirror: False | ||
| 650 | 212 | country_link: u'http://.../+countries/GL' | 219 | country_link: u'http://.../+countries/GL' |
| 651 | 213 | date_created: u'2006-10-16T18:31:43.434567+00:00' | 220 | date_created: u'2006-10-16T18:31:43.434567+00:00' |
| 652 | 214 | date_reviewed: None | 221 | date_reviewed: None |
| 653 | @@ -244,7 +251,9 @@ | |||
| 654 | 244 | "getOverallFreshness" returns the freshness of the mirror determined by the | 251 | "getOverallFreshness" returns the freshness of the mirror determined by the |
| 655 | 245 | mirror prober from the mirror's last probe. | 252 | mirror prober from the mirror's last probe. |
| 656 | 246 | 253 | ||
| 658 | 247 | >>> releases_mirror2 = ubuntu_cd_mirrors['entries'][2] | 254 | >>> releases_mirror2 = webservice.named_get( |
| 659 | 255 | ... ubuntu['self_link'], 'getMirrorByName', | ||
| 660 | 256 | ... name='releases-mirror2').jsonBody() | ||
| 661 | 248 | >>> freshness = webservice.named_get(releases_mirror2['self_link'], | 257 | >>> freshness = webservice.named_get(releases_mirror2['self_link'], |
| 662 | 249 | ... 'getOverallFreshness').jsonBody() | 258 | ... 'getOverallFreshness').jsonBody() |
| 663 | 250 | >>> print freshness | 259 | >>> print freshness |
| 664 | 251 | 260 | ||
| 665 | === modified file 'lib/lp/registry/stories/webservice/xx-distribution.txt' | |||
| 666 | --- lib/lp/registry/stories/webservice/xx-distribution.txt 2010-02-23 17:36:27 +0000 | |||
| 667 | +++ lib/lp/registry/stories/webservice/xx-distribution.txt 2010-03-31 15:03:35 +0000 | |||
| 668 | @@ -123,6 +123,7 @@ | |||
| 669 | 123 | ... name='canonical-releases').jsonBody() | 123 | ... name='canonical-releases').jsonBody() |
| 670 | 124 | >>> pprint_entry(canonical_releases) | 124 | >>> pprint_entry(canonical_releases) |
| 671 | 125 | content: u'CD Image' | 125 | content: u'CD Image' |
| 672 | 126 | country_dns_mirror: False | ||
| 673 | 126 | country_link: u'http://.../+countries/GB' | 127 | country_link: u'http://.../+countries/GB' |
| 674 | 127 | date_created: u'2006-10-16T18:31:43.434567+00:00' | 128 | date_created: u'2006-10-16T18:31:43.434567+00:00' |
| 675 | 128 | date_reviewed: None | 129 | date_reviewed: None |
| 676 | @@ -142,3 +143,76 @@ | |||
| 677 | 142 | speed: u'100 Mbps' | 143 | speed: u'100 Mbps' |
| 678 | 143 | status: u'Official' | 144 | status: u'Official' |
| 679 | 144 | whiteboard: None | 145 | whiteboard: None |
| 680 | 146 | |||
| 681 | 147 | "getCountryMirror" returns the country DNS mirror for a given country; | ||
| 682 | 148 | returning None if there isn't one. | ||
| 683 | 149 | |||
| 684 | 150 | >>> # Prepare stuff. | ||
| 685 | 151 | >>> from lp.registry.interfaces.distribution import IDistributionSet | ||
| 686 | 152 | >>> from zope.component import getUtility | ||
| 687 | 153 | >>> from canonical.launchpad.testing.pages import webservice_for_person | ||
| 688 | 154 | >>> from canonical.launchpad.webapp.interfaces import OAuthPermission | ||
| 689 | 155 | >>> from lp.registry.interfaces.person import IPersonSet | ||
| 690 | 156 | >>> from simplejson import dumps | ||
| 691 | 157 | |||
| 692 | 158 | >>> login('admin@canonical.com') | ||
| 693 | 159 | >>> ubuntu_distro = getUtility(IDistributionSet).getByName('ubuntu') | ||
| 694 | 160 | >>> showa_station = factory.makeMirror(ubuntu_distro, | ||
| 695 | 161 | ... "Showa Station", country=9, | ||
| 696 | 162 | ... http_url="http://mirror.showa.antarctica.org/ubuntu", | ||
| 697 | 163 | ... official_candidate=True) | ||
| 698 | 164 | >>> showa_station_log = factory.makeMirrorProbeRecord(showa_station) | ||
| 699 | 165 | >>> logout() | ||
| 700 | 166 | |||
| 701 | 167 | >>> login(ANONYMOUS) | ||
| 702 | 168 | >>> karl_db = getUtility(IPersonSet).getByName('karl') | ||
| 703 | 169 | >>> karl_webservice = webservice_for_person(karl_db, | ||
| 704 | 170 | ... permission=OAuthPermission.WRITE_PUBLIC) | ||
| 705 | 171 | >>> logout() | ||
| 706 | 172 | |||
| 707 | 173 | >>> # Mark new mirror as official and a country mirror. | ||
| 708 | 174 | >>> patch = { | ||
| 709 | 175 | ... u'status': 'Official', | ||
| 710 | 176 | ... u'country_dns_mirror': True | ||
| 711 | 177 | ... } | ||
| 712 | 178 | |||
| 713 | 179 | >>> antarctica_patch_target = webservice.named_get( | ||
| 714 | 180 | ... ubuntu['self_link'], 'getMirrorByName', | ||
| 715 | 181 | ... name='mirror.showa.antarctica.org-archive').jsonBody() | ||
| 716 | 182 | ... ) | ||
| 717 | 183 | |||
| 718 | 184 | >>> response = karl_webservice.patch( | ||
| 719 | 185 | ... antarctica_patch_target['self_link'], 'application/json', | ||
| 720 | 186 | ... dumps(patch)) | ||
| 721 | 187 | |||
| 722 | 188 | >>> antarctica = webservice.get("/+countries/AQ").jsonBody() | ||
| 723 | 189 | >>> antarctica_country_mirror_archive = webservice.named_get( | ||
| 724 | 190 | ... ubuntu['self_link'], 'getCountryMirror', | ||
| 725 | 191 | ... country=antarctica['self_link'], | ||
| 726 | 192 | ... mirror_type="Archive").jsonBody() | ||
| 727 | 193 | >>> pprint_entry(antarctica_country_mirror_archive) | ||
| 728 | 194 | content: u'Archive' | ||
| 729 | 195 | country_dns_mirror: True | ||
| 730 | 196 | country_link: u'http://.../+countries/AQ' | ||
| 731 | 197 | ... | ||
| 732 | 198 | |||
| 733 | 199 | >>> uk = webservice.get("/+countries/GB").jsonBody() | ||
| 734 | 200 | >>> uk_country_mirror_archive = webservice.named_get( | ||
| 735 | 201 | ... ubuntu['self_link'], 'getCountryMirror', | ||
| 736 | 202 | ... country=uk['self_link'], | ||
| 737 | 203 | ... mirror_type="Archive") | ||
| 738 | 204 | >>> print uk_country_mirror_archive.jsonBody() | ||
| 739 | 205 | None | ||
| 740 | 206 | |||
| 741 | 207 | For "getCountryMirror", the mirror_type parameter must be "Archive" or | ||
| 742 | 208 | "CD Images": | ||
| 743 | 209 | |||
| 744 | 210 | >>> uk_country_mirror_archive = webservice.named_get( | ||
| 745 | 211 | ... ubuntu['self_link'], 'getCountryMirror', | ||
| 746 | 212 | ... country=uk['self_link'], | ||
| 747 | 213 | ... mirror_type="Bogus") | ||
| 748 | 214 | >>> print uk_country_mirror_archive.jsonBody() | ||
| 749 | 215 | Traceback (most recent call last): | ||
| 750 | 216 | ... | ||
| 751 | 217 | ValueError: mirror_type: Invalid value "Bogus". Acceptable values are: | ||
| 752 | 218 | Archive, CD Image | ||
| 753 | 145 | 219 | ||
| 754 | === modified file 'lib/lp/registry/tests/test_distributionmirror.py' | |||
| 755 | --- lib/lp/registry/tests/test_distributionmirror.py 2009-10-26 18:40:04 +0000 | |||
| 756 | +++ lib/lp/registry/tests/test_distributionmirror.py 2010-03-31 15:03:35 +0000 | |||
| 757 | @@ -3,7 +3,6 @@ | |||
| 758 | 3 | 3 | ||
| 759 | 4 | __metaclass__ = type | 4 | __metaclass__ = type |
| 760 | 5 | 5 | ||
| 761 | 6 | from StringIO import StringIO | ||
| 762 | 7 | import unittest | 6 | import unittest |
| 763 | 8 | 7 | ||
| 764 | 9 | import transaction | 8 | import transaction |
| 765 | @@ -17,19 +16,19 @@ | |||
| 766 | 17 | from lp.registry.interfaces.distributionmirror import ( | 16 | from lp.registry.interfaces.distributionmirror import ( |
| 767 | 18 | IDistributionMirrorSet, MirrorContent, MirrorFreshness) | 17 | IDistributionMirrorSet, MirrorContent, MirrorFreshness) |
| 768 | 19 | from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities | 18 | from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities |
| 769 | 20 | from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet | ||
| 770 | 21 | from lp.registry.interfaces.pocket import PackagePublishingPocket | 19 | from lp.registry.interfaces.pocket import PackagePublishingPocket |
| 771 | 22 | from lp.registry.interfaces.distribution import IDistributionSet | 20 | from lp.registry.interfaces.distribution import IDistributionSet |
| 772 | 23 | from lp.services.mail import stub | 21 | from lp.services.mail import stub |
| 773 | 22 | from lp.testing.factory import LaunchpadObjectFactory | ||
| 774 | 24 | 23 | ||
| 775 | 25 | from canonical.testing import LaunchpadFunctionalLayer | 24 | from canonical.testing import LaunchpadFunctionalLayer |
| 776 | 26 | 25 | ||
| 777 | 27 | |||
| 778 | 28 | class TestDistributionMirror(unittest.TestCase): | 26 | class TestDistributionMirror(unittest.TestCase): |
| 779 | 29 | layer = LaunchpadFunctionalLayer | 27 | layer = LaunchpadFunctionalLayer |
| 780 | 30 | 28 | ||
| 781 | 31 | def setUp(self): | 29 | def setUp(self): |
| 782 | 32 | login('test@canonical.com') | 30 | login('test@canonical.com') |
| 783 | 31 | self.factory = LaunchpadObjectFactory() | ||
| 784 | 33 | mirrorset = getUtility(IDistributionMirrorSet) | 32 | mirrorset = getUtility(IDistributionMirrorSet) |
| 785 | 34 | self.cdimage_mirror = getUtility(IDistributionMirrorSet).getByName( | 33 | self.cdimage_mirror = getUtility(IDistributionMirrorSet).getByName( |
| 786 | 35 | 'releases-mirror') | 34 | 'releases-mirror') |
| 787 | @@ -132,15 +131,6 @@ | |||
| 788 | 132 | self.archive_mirror.getOverallFreshness(), | 131 | self.archive_mirror.getOverallFreshness(), |
| 789 | 133 | MirrorFreshness.TWODAYSBEHIND) | 132 | MirrorFreshness.TWODAYSBEHIND) |
| 790 | 134 | 133 | ||
| 791 | 135 | def _create_probe_record(self, mirror): | ||
| 792 | 136 | log_file = StringIO() | ||
| 793 | 137 | log_file.write("Fake probe, nothing useful here.") | ||
| 794 | 138 | log_file.seek(0) | ||
| 795 | 139 | library_alias = getUtility(ILibraryFileAliasSet).create( | ||
| 796 | 140 | name='foo', size=len(log_file.getvalue()), | ||
| 797 | 141 | file=log_file, contentType='text/plain') | ||
| 798 | 142 | proberecord = mirror.newProbeRecord(library_alias) | ||
| 799 | 143 | |||
| 800 | 144 | def test_disabling_mirror_and_notifying_owner(self): | 134 | def test_disabling_mirror_and_notifying_owner(self): |
| 801 | 145 | login('karl@canonical.com') | 135 | login('karl@canonical.com') |
| 802 | 146 | 136 | ||
| 803 | @@ -148,7 +138,7 @@ | |||
| 804 | 148 | # If a mirror has been probed only once, the owner will always be | 138 | # If a mirror has been probed only once, the owner will always be |
| 805 | 149 | # notified when it's disabled --it doesn't matter whether it was | 139 | # notified when it's disabled --it doesn't matter whether it was |
| 806 | 150 | # previously enabled or disabled. | 140 | # previously enabled or disabled. |
| 808 | 151 | self._create_probe_record(mirror) | 141 | self.factory.makeMirrorProbeRecord(mirror) |
| 809 | 152 | self.failUnless(mirror.enabled) | 142 | self.failUnless(mirror.enabled) |
| 810 | 153 | log = 'Got a 404 on http://foo/baz' | 143 | log = 'Got a 404 on http://foo/baz' |
| 811 | 154 | mirror.disable(notify_owner=True, log=log) | 144 | mirror.disable(notify_owner=True, log=log) |
| 812 | @@ -166,7 +156,7 @@ | |||
| 813 | 166 | 156 | ||
| 814 | 167 | # For mirrors that have been probed more than once, we'll only notify | 157 | # For mirrors that have been probed more than once, we'll only notify |
| 815 | 168 | # the owner if the mirror was previously enabled. | 158 | # the owner if the mirror was previously enabled. |
| 817 | 169 | self._create_probe_record(mirror) | 159 | self.factory.makeMirrorProbeRecord(mirror) |
| 818 | 170 | mirror.enabled = True | 160 | mirror.enabled = True |
| 819 | 171 | mirror.disable(notify_owner=True, log=log) | 161 | mirror.disable(notify_owner=True, log=log) |
| 820 | 172 | # A notification was sent to the owner and other to the mirror admins. | 162 | # A notification was sent to the owner and other to the mirror admins. |
| 821 | 173 | 163 | ||
| 822 | === modified file 'lib/lp/testing/factory.py' | |||
| 823 | --- lib/lp/testing/factory.py 2010-03-25 02:21:15 +0000 | |||
| 824 | +++ lib/lp/testing/factory.py 2010-03-31 15:03:35 +0000 | |||
| 825 | @@ -1981,8 +1981,22 @@ | |||
| 826 | 1981 | team_list = self.makeMailingList(team, owner) | 1981 | team_list = self.makeMailingList(team, owner) |
| 827 | 1982 | return team, team_list | 1982 | return team, team_list |
| 828 | 1983 | 1983 | ||
| 829 | 1984 | def makeMirrorProbeRecord(self, mirror): | ||
| 830 | 1985 | """Create a probe record for a mirror of a distribution.""" | ||
| 831 | 1986 | log_file = StringIO() | ||
| 832 | 1987 | log_file.write("Fake probe, nothing useful here.") | ||
| 833 | 1988 | log_file.seek(0) | ||
| 834 | 1989 | |||
| 835 | 1990 | library_alias = getUtility(ILibraryFileAliasSet).create( | ||
| 836 | 1991 | name='foo', size=len(log_file.getvalue()), | ||
| 837 | 1992 | file=log_file, contentType='text/plain') | ||
| 838 | 1993 | |||
| 839 | 1994 | proberecord = mirror.newProbeRecord(library_alias) | ||
| 840 | 1995 | return proberecord | ||
| 841 | 1996 | |||
| 842 | 1984 | def makeMirror(self, distribution, displayname, country=None, | 1997 | def makeMirror(self, distribution, displayname, country=None, |
| 844 | 1985 | http_url=None, ftp_url=None, rsync_url=None): | 1998 | http_url=None, ftp_url=None, rsync_url=None, |
| 845 | 1999 | official_candidate=False): | ||
| 846 | 1986 | """Create a mirror for the distribution.""" | 2000 | """Create a mirror for the distribution.""" |
| 847 | 1987 | # If no URL is specified create an HTTP URL. | 2001 | # If no URL is specified create an HTTP URL. |
| 848 | 1988 | if http_url is None and ftp_url is None and rsync_url is None: | 2002 | if http_url is None and ftp_url is None and rsync_url is None: |
| 849 | @@ -2001,7 +2015,7 @@ | |||
| 850 | 2001 | http_base_url=http_url, | 2015 | http_base_url=http_url, |
| 851 | 2002 | ftp_base_url=ftp_url, | 2016 | ftp_base_url=ftp_url, |
| 852 | 2003 | rsync_base_url=rsync_url, | 2017 | rsync_base_url=rsync_url, |
| 854 | 2004 | official_candidate=False) | 2018 | official_candidate=official_candidate) |
| 855 | 2005 | return mirror | 2019 | return mirror |
| 856 | 2006 | 2020 | ||
| 857 | 2007 | def makeUniqueRFC822MsgId(self): | 2021 | def makeUniqueRFC822MsgId(self): |
Your merge proposal should show the output of make lint to verify your
changes did not have any cruft. It will also inform you of style mistakes
that must be fixed before making a merge proposal.
I have some ideas to improve the code, and I think the interface and model
are missing essential documentation and unit tests. I suspect that the
story tests (which are integration tests) are test what should be testing
as documentation and unit tests.
> === modified file 'lib/lp/
> --- lib/lp/
> +++ lib/lp/
> @@ -318,6 +318,16 @@
> if it's not found.
> """
>
> + @operation_
> + country=
> + mirror_
> + @operation_
> + @export_
> + def getCountryMirro
> + """Return the country DNS mirror for a given country and content
> + type.
> + """
> +
This docstring does not follow PEP 257. The first sentence must be one line.
Subsequent sentences may follow after a blank line:
http://
Think this fixes the issue:
"""Return the country DNS mirror for a country and content type."""
> === modified file 'lib/lp/
> --- lib/lp/
> +++ lib/lp/
> @@ -6,21 +6,23 @@
> __metaclass__ = type
>
> __all__ = [
> +'CannotTransit
> +'CountryMirror
> 'IDistributionM
> -'IDistribution
> -'IDistribution
> -'IDistribution
> 'IMirrorDistroA
> 'IMirrorDistroS
> 'IMirrorProbeRe
> 'IDistributionM
> 'IMirrorCDImage
> 'PROBE_INTERVAL',
> -'UnableToFetch
> 'MirrorContent',
> 'MirrorFreshness',
> +'MirrorHasNoHT
> +'MirrorNotOffi
> +'MirrorNotProbed',
> 'MirrorSpeed',
> -'MirrorStatus']
> +'MirrorStatus',
> +'UnableToFetch
Per PEP 8, this list of single entries must each be indented and required a
trailing comma; the closing bracket on on a separate line to minimise diffs,
which I can see that this diff is already a victim:
'MirrorStatus',
'UnableToFe
]
> @@ -47,6 +52,44 @@
> PROBE_INTERVAL = 23
>
> +class CannotTransitio
> + """Root exception for transitions to country mirrors.
> + """
The closing quotes belong on the previous line PEP 257.
> + webservice_
Launchpad style does not use trailing comments because they interfere with
refactoring. I do not think comments about HTTP codes are informative;
we are expect to know them.
> @@ -386,6 +406,33 @@
> date_created = exported(Datetime(
> title=_('Date Crea...