commit python-glanceclient for openSUSE:13.1

Hello community, here is the log from the commit of package python-glanceclient for openSUSE:13.1 checked in at 2013-10-23 11:26:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/python-glanceclient (Old) and /work/SRC/openSUSE:13.1/.python-glanceclient.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-glanceclient" Changes: -------- --- /work/SRC/openSUSE:13.1/python-glanceclient/python-glanceclient.changes 2013-10-02 13:32:48.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.python-glanceclient.new/python-glanceclient.changes 2013-10-23 11:26:55.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Oct 7 10:21:35 UTC 2013 - opensuse-cloud@opensuse.org + +- Downgrade to version 0.11.0: + * go with a released version for openSUSE 13.1 + +------------------------------------------------------------------- Old: ---- python-glanceclient-master.tar.gz New: ---- python-glanceclient-0.11.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-glanceclient.spec ++++++ --- /var/tmp/diff_new_pack.SFixjT/_old 2013-10-23 11:26:56.000000000 +0200 +++ /var/tmp/diff_new_pack.SFixjT/_new 2013-10-23 11:26:56.000000000 +0200 @@ -19,13 +19,13 @@ %define component glanceclient Name: python-glanceclient -Version: 0.10.0.21 +Version: 0.11.0 Release: 0 Summary: Openstack Image (Glance) API Client License: Apache-2.0 Group: Development/Languages/Python Url: http://launchpad.net/python-glanceclient -Source: python-glanceclient-master.tar.gz +Source: python-glanceclient-0.11.0.tar.gz Source2: openstack-glance.sh BuildRequires: openstack-suse-macros BuildRequires: python-base @@ -80,7 +80,7 @@ This package contains testsuite files for %{name}. %prep -%setup -q -n python-glanceclient-0.10.0.21.g7a4a8a0 +%setup -q -n python-glanceclient-0.11.0 %openstack_cleanup_prep # Our package versioning scheme is different (but we provide the correct thing) thus: sed -i "s|python-keystoneclient>=0.1.2,<1|python-keystoneclient|" requirements.txt ++++++ _service ++++++ --- /var/tmp/diff_new_pack.SFixjT/_old 2013-10-23 11:26:56.000000000 +0200 +++ /var/tmp/diff_new_pack.SFixjT/_new 2013-10-23 11:26:56.000000000 +0200 @@ -1,8 +1,7 @@ <services> <service name="git_tarballs" mode="disabled"> - <param name="url">http://tarballs.openstack.org/python-glanceclient/python-glanceclient-master...</param> + <param name="url">http://tarballs.openstack.org/python-glanceclient/python-glanceclient-0.11.0...</param> <param name="email">opensuse-cloud@opensuse.org</param> - <param name="version-regexp">.*-([^-]+)\.g[a-zA-Z0-9]{7}</param> <param name="plain-version">True</param> </service> </services> ++++++ python-glanceclient-master.tar.gz -> python-glanceclient-0.11.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-glanceclient-0.10.0.21.g7a4a8a0/AUTHORS new/python-glanceclient-0.11.0/AUTHORS --- old/python-glanceclient-0.10.0.21.g7a4a8a0/AUTHORS 2013-09-25 22:02:45.000000000 +0200 +++ new/python-glanceclient-0.11.0/AUTHORS 2013-08-23 17:07:17.000000000 +0200 @@ -18,17 +18,13 @@ Davanum Srinivas David Peraza David Wittman -Dazhao Dean Troyer Diego Parrilla Dirk Mueller Doug Hellmann -Fei Long Wang Flaper Fesp Florian Haas -Gabe Westmaas Gabriel Hurley -Ghe Rivero Hugh Saunders Jakub Ruzicka James E. Blair diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-glanceclient-0.10.0.21.g7a4a8a0/ChangeLog new/python-glanceclient-0.11.0/ChangeLog --- old/python-glanceclient-0.10.0.21.g7a4a8a0/ChangeLog 2013-09-25 22:02:45.000000000 +0200 +++ new/python-glanceclient-0.11.0/ChangeLog 2013-08-23 17:07:17.000000000 +0200 @@ -1,60 +1,4 @@ -commit 7a4a8a0979fd76203f0cb81622a7f06ee42bb615 -Merge: 360a29a 061da46 -Author: Jenkins -Date: Wed Sep 25 20:01:58 2013 +0000 - - Merge "Support glance client can get ipv6 image url correctly" - -commit 360a29a763ba89323fb2d501ac1edd77185f418f -Merge: 897ae3d 3307549 -Author: Jenkins -Date: Thu Sep 19 17:55:45 2013 +0000 - - Merge "Use openstack-images-v2.1-json-patch for update method" - -commit 061da46202759f55866d224f9ab8013e747637c7 -Author: Dazhao -Date: Wed Aug 21 12:54:19 2013 +0800 - - Support glance client can get ipv6 image url correctly - - This patch is for fix bug 1208784. In openstack ipv6 environment, - if the os image url is not provided, need use the provided host - to generate literal ipv6 image url. - - Fixes bug 1208784 - - Change-Id: Icb71241a639db02d079348f086bd7bd5f0412609 - -commit 897ae3d795423a0f1d92f0738ad4dff99c28c6de -Author: Fei Long Wang -Date: Sun Aug 11 11:02:32 2013 +0800 - - Enable query image by tag - - This patch will enable Glance client to query images by user - defined tags. - - Implement bp image-query-by-tag - Implement bp glance-client-v2 - - Change-Id: I6f54630c5b7c9c567d85485ad4289284e5486814 - -commit b6e117f151e6d3ed8dc4849c4138d7fb28652e75 -Author: Gabe Westmaas -Date: Sun Aug 25 01:14:07 2013 +0000 - - Fix glanceclient usage inconsistences for options - - Enumerated options should have the same format for all enumerated options. - - This commit moves all options to the {option1,option2} format. - - fixes bug: #1155171 - - Change-Id: I8e0ecf3896c76021cb027cbbbb3b5564a04aacec - -commit b15c57c4a2cd7566072fcf8adb1422cb3e21b1de +commit a1c5305c6264105794b70b248fb87f8ac89ecb41 Author: Mark J. Washenberger Date: Thu Aug 22 16:01:29 2013 -0700 @@ -62,19 +6,6 @@ Change-Id: Ic76e872e78ec77b731ad9dced833803da3fa9aca -commit 3307549a0f66294972c8b5ebff59ab01d18a1d91 -Author: Ghe Rivero -Date: Mon Jul 29 11:41:10 2013 +0000 - - Use openstack-images-v2.1-json-patch for update method - - image.patch returns a JSON schema Draft 10 (application/openstack-images-v2.1-json-patch) - while the glaceclient update method specify a Content-Type header - application/openstack-images-v2.0-json-patch with correspond to a JSON schemea Draft 4. - - Fixes bug 1206095 - Change-Id: I8c5a96f0e117a81b5b527a96ef45758fc69b518d - commit 835638fd8ad4fb39be2161ee79057565809082ab Merge: fe9a62b a30981e Author: Jenkins diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-glanceclient-0.10.0.21.g7a4a8a0/PKG-INFO new/python-glanceclient-0.11.0/PKG-INFO --- old/python-glanceclient-0.10.0.21.g7a4a8a0/PKG-INFO 2013-09-25 22:02:45.000000000 +0200 +++ new/python-glanceclient-0.11.0/PKG-INFO 2013-08-23 17:07:17.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: python-glanceclient -Version: 0.10.0.21.g7a4a8a0 +Version: 0.11.0 Summary: OpenStack Image API Client Library Home-page: http://www.openstack.org/ Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-glanceclient-0.10.0.21.g7a4a8a0/glanceclient/shell.py new/python-glanceclient-0.11.0/glanceclient/shell.py --- old/python-glanceclient-0.10.0.21.g7a4a8a0/glanceclient/shell.py 2013-09-25 22:02:10.000000000 +0200 +++ new/python-glanceclient-0.11.0/glanceclient/shell.py 2013-08-23 17:05:41.000000000 +0200 @@ -23,7 +23,6 @@ import sys from keystoneclient.v2_0 import client as ksclient -import netaddr import glanceclient from glanceclient import exc @@ -348,9 +347,6 @@ if args.os_image_url: return args.os_image_url elif args.host: - # Check if it is legal ipv6 address, if so, need wrap it with '[]' - if netaddr.valid_ipv6(args.host): - args.host = '[%s]' % args.host scheme = 'https' if args.use_ssl else 'http' return '%s://%s:%s/' % (scheme, args.host, args.port) else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-glanceclient-0.10.0.21.g7a4a8a0/glanceclient/v1/shell.py new/python-glanceclient-0.11.0/glanceclient/v1/shell.py --- old/python-glanceclient-0.10.0.21.g7a4a8a0/glanceclient/v1/shell.py 2013-09-25 22:02:10.000000000 +0200 +++ new/python-glanceclient-0.11.0/glanceclient/v1/shell.py 2013-08-23 17:05:41.000000000 +0200 @@ -64,7 +64,7 @@ @utils.arg('--sort-dir', default='asc', choices=glanceclient.v1.images.SORT_DIR_VALUES, help='Sort image list in specified direction.') -@utils.arg('--is-public', type=utils.string_to_bool, metavar='{True,False}', +@utils.arg('--is-public', type=utils.string_to_bool, metavar='{True|False}', help=('Allows the user to select a listing of public or non ' 'public images.')) @utils.arg('--owner', default=None, metavar='', @@ -215,9 +215,9 @@ # to use --is-public @utils.arg('--public', action='store_true', default=False, help=argparse.SUPPRESS) -@utils.arg('--is-public', type=utils.string_to_bool, metavar='{True,False}', +@utils.arg('--is-public', type=utils.string_to_bool, metavar='[True|False]', help='Make image accessible to the public.') -@utils.arg('--is-protected', type=utils.string_to_bool, metavar='{True,False}', +@utils.arg('--is-protected', type=utils.string_to_bool, metavar='[True|False]', help='Prevent image from being deleted.') @utils.arg('--property', metavar="", action='append', default=[], help=("Arbitrary property to associate with image. " @@ -287,9 +287,9 @@ help=('Similar to \'--location\' in usage, but this indicates that' ' the Glance server should immediately copy the data and' ' store it in its configured image store.')) -@utils.arg('--is-public', type=utils.string_to_bool, metavar='{True,False}', +@utils.arg('--is-public', type=utils.string_to_bool, metavar='[True|False]', help='Make image accessible to the public.') -@utils.arg('--is-protected', type=utils.string_to_bool, metavar='{True,False}', +@utils.arg('--is-protected', type=utils.string_to_bool, metavar='[True|False]', help='Prevent image from being deleted.') @utils.arg('--property', metavar="", action='append', default=[], help=("Arbitrary property to associate with image. " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-glanceclient-0.10.0.21.g7a4a8a0/glanceclient/v2/images.py new/python-glanceclient-0.11.0/glanceclient/v2/images.py --- old/python-glanceclient-0.10.0.21.g7a4a8a0/glanceclient/v2/images.py 2013-09-25 22:02:10.000000000 +0200 +++ new/python-glanceclient-0.11.0/glanceclient/v2/images.py 2013-08-23 17:05:41.000000000 +0200 @@ -52,22 +52,12 @@ else: filters['limit'] = kwargs['page_size'] - tags = filters.pop('tag', []) - tags_url_params = [] - - for tag in tags: - if isinstance(tag, basestring): - tags_url_params.append({'tag': strutils.safe_encode(tag)}) - for param, value in filters.iteritems(): if isinstance(value, basestring): filters[param] = strutils.safe_encode(value) url = '/v2/images?%s' % urllib.urlencode(filters) - for param in tags_url_params: - url = '%s&%s' % (url, urllib.urlencode(param)) - for image in paginate(url): #NOTE(bcwaldon): remove 'self' for now until we have an elegant # way to pass it into the model constructor without conflict @@ -157,7 +147,7 @@ delattr(image, key) url = '/v2/images/%s' % image_id - hdrs = {'Content-Type': 'application/openstack-images-v2.1-json-patch'} + hdrs = {'Content-Type': 'application/openstack-images-v2.0-json-patch'} self.http_client.raw_request('PATCH', url, headers=hdrs, body=image.patch) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-glanceclient-0.10.0.21.g7a4a8a0/glanceclient/v2/shell.py new/python-glanceclient-0.11.0/glanceclient/v2/shell.py --- old/python-glanceclient-0.10.0.21.g7a4a8a0/glanceclient/v2/shell.py 2013-09-25 22:02:10.000000000 +0200 +++ new/python-glanceclient-0.11.0/glanceclient/v2/shell.py 2013-08-23 17:05:41.000000000 +0200 @@ -28,11 +28,9 @@ help='Display images owned by <OWNER>.') @utils.arg('--checksum', metavar='<CHECKSUM>', help='Display images matching the checksum') -@utils.arg('--tag', metavar='<TAG>', action='append', - help="Filter images by an user-defined tag.") def do_image_list(gc, args): """List images you can access.""" - filter_keys = ['visibility', 'member_status', 'owner', 'checksum', 'tag'] + filter_keys = ['visibility', 'member_status', 'owner', 'checksum'] filter_items = [(key, getattr(args, key)) for key in filter_keys] filters = dict([item for item in filter_items if item[1] is not None]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-glanceclient-0.10.0.21.g7a4a8a0/python_glanceclient.egg-info/PKG-INFO new/python-glanceclient-0.11.0/python_glanceclient.egg-info/PKG-INFO --- old/python-glanceclient-0.10.0.21.g7a4a8a0/python_glanceclient.egg-info/PKG-INFO 2013-09-25 22:02:45.000000000 +0200 +++ new/python-glanceclient-0.11.0/python_glanceclient.egg-info/PKG-INFO 2013-08-23 17:07:17.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: python-glanceclient -Version: 0.10.0.21.g7a4a8a0 +Version: 0.11.0 Summary: OpenStack Image API Client Library Home-page: http://www.openstack.org/ Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-glanceclient-0.10.0.21.g7a4a8a0/tests/test_shell.py new/python-glanceclient-0.11.0/tests/test_shell.py --- old/python-glanceclient-0.10.0.21.g7a4a8a0/tests/test_shell.py 2013-09-25 22:02:10.000000000 +0200 +++ new/python-glanceclient-0.11.0/tests/test_shell.py 2013-08-23 17:05:41.000000000 +0200 @@ -80,14 +80,3 @@ add_help=False, formatter_class=openstack_shell.HelpFormatter,) self.assertTrue(expected, actual_parser) - - def test_get_image_url_by_ipv6Addr_host(self): - fake_args = lambda: None - setattr(fake_args, 'os_image_url', None) - setattr(fake_args, 'host', '2011:2013:1:f101::1') - setattr(fake_args, 'use_ssl', True) - setattr(fake_args, 'port', '9292') - expected_image_url = 'https://[2011:2013:1:f101::1]:9292/' - test_shell = openstack_shell.OpenStackImagesShell() - targeted_image_url = test_shell._get_image_url(fake_args) - self.assertEqual(expected_image_url, targeted_image_url) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-glanceclient-0.10.0.21.g7a4a8a0/tests/v2/test_images.py new/python-glanceclient-0.11.0/tests/v2/test_images.py --- old/python-glanceclient-0.10.0.21.g7a4a8a0/tests/v2/test_images.py 2013-09-25 22:02:10.000000000 +0200 +++ new/python-glanceclient-0.11.0/tests/v2/test_images.py 2013-08-23 17:05:41.000000000 +0200 @@ -24,9 +24,6 @@ _CHKSUM = '93264c3edf5972c9f1cb309543d38a5c' _CHKSUM1 = '54264c3edf5972c9f1cb309453d38a46' -_TAG1 = 'power' -_TAG2 = '64bit' - _BOGUS_ID = '63e7f218-29de-4477-abdc-8db7c9533188' _EVERYTHING_ID = '802cbbb7-0379-4c38-853f-37302b5e3d29' _OWNED_IMAGE_ID = 'a4963502-acc7-42ba-ad60-5aa0962b7faf' @@ -257,51 +254,6 @@ {'images': []}, ), }, - '/v2/images?limit=%d&tag=%s' % (images.DEFAULT_PAGE_SIZE, _TAG1): { - 'GET': ( - {}, - {'images': [ - { - 'id': '3a4560a1-e585-443e-9b39-553b46ec92d1', - 'name': 'image-1', - } - ]}, - ), - }, - '/v2/images?limit=%d&tag=%s' % (images.DEFAULT_PAGE_SIZE, _TAG2): { - 'GET': ( - {}, - {'images': [ - { - 'id': '2a4560b2-e585-443e-9b39-553b46ec92d1', - 'name': 'image-1', - }, - { - 'id': '6f99bf80-2ee6-47cf-acfe-1f1fabb7e810', - 'name': 'image-2', - }, - ]}, - ), - }, - '/v2/images?limit=%d&tag=%s&tag=%s' % (images.DEFAULT_PAGE_SIZE, - _TAG1, _TAG2): - { - 'GET': ( - {}, - {'images': [ - { - 'id': '2a4560b2-e585-443e-9b39-553b46ec92d1', - 'name': 'image-1', - } - ]}, - ), - }, - '/v2/images?limit=%d&tag=fake' % images.DEFAULT_PAGE_SIZE: { - 'GET': ( - {}, - {'images': []}, - ), - }, } @@ -406,35 +358,6 @@ self.assertEqual(filters["owner"], "ni\xc3\xb1o") - def test_list_images_for_tag_single_image(self): - img_id = '3a4560a1-e585-443e-9b39-553b46ec92d1' - filters = {'filters': dict([('tag', [_TAG1])])} - images = list(self.controller.list(**filters)) - self.assertEquals(1, len(images)) - self.assertEqual(images[0].id, '%s' % img_id) - pass - - def test_list_images_for_tag_multiple_images(self): - img_id1 = '2a4560b2-e585-443e-9b39-553b46ec92d1' - img_id2 = '6f99bf80-2ee6-47cf-acfe-1f1fabb7e810' - filters = {'filters': dict([('tag', [_TAG2])])} - images = list(self.controller.list(**filters)) - self.assertEquals(2, len(images)) - self.assertEqual(images[0].id, '%s' % img_id1) - self.assertEqual(images[1].id, '%s' % img_id2) - - def test_list_images_for_multi_tags(self): - img_id1 = '2a4560b2-e585-443e-9b39-553b46ec92d1' - filters = {'filters': dict([('tag', [_TAG1, _TAG2])])} - images = list(self.controller.list(**filters)) - self.assertEquals(1, len(images)) - self.assertEqual(images[0].id, '%s' % img_id1) - - def test_list_images_for_non_existent_tag(self): - filters = {'filters': dict([('tag', ['fake'])])} - images = list(self.controller.list(**filters)) - self.assertEquals(0, len(images)) - def test_get_image(self): image = self.controller.get('3a4560a1-e585-443e-9b39-553b46ec92d1') self.assertEqual(image.id, '3a4560a1-e585-443e-9b39-553b46ec92d1') @@ -514,7 +437,7 @@ params = {'name': 'pong'} image = self.controller.update(image_id, **params) expect_hdrs = { - 'Content-Type': 'application/openstack-images-v2.1-json-patch', + 'Content-Type': 'application/openstack-images-v2.0-json-patch', } expect_body = '[{"path": "/name", "value": "pong", "op": "replace"}]' expect = [ @@ -533,7 +456,7 @@ params = {'finn': 'human'} image = self.controller.update(image_id, **params) expect_hdrs = { - 'Content-Type': 'application/openstack-images-v2.1-json-patch', + 'Content-Type': 'application/openstack-images-v2.0-json-patch', } expect_body = '[{"path": "/finn", "value": "human", "op": "add"}]' expect = [ @@ -552,7 +475,7 @@ remove_props = ['barney'] image = self.controller.update(image_id, remove_props) expect_hdrs = { - 'Content-Type': 'application/openstack-images-v2.1-json-patch', + 'Content-Type': 'application/openstack-images-v2.0-json-patch', } expect_body = '[{"path": "/barney", "op": "remove"}]' expect = [ @@ -573,7 +496,7 @@ remove_props = ['barney'] image = self.controller.update(image_id, remove_props, **params) expect_hdrs = { - 'Content-Type': 'application/openstack-images-v2.1-json-patch', + 'Content-Type': 'application/openstack-images-v2.0-json-patch', } expect_body = '[{"path": "/barney", "value": "miller", ' \ '"op": "replace"}]' @@ -595,7 +518,7 @@ remove_props = ['finn'] image = self.controller.update(image_id, remove_props, **params) expect_hdrs = { - 'Content-Type': 'application/openstack-images-v2.1-json-patch', + 'Content-Type': 'application/openstack-images-v2.0-json-patch', } expect_body = '[{"path": "/finn", "value": "human", "op": "add"}]' expect = [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-glanceclient-0.10.0.21.g7a4a8a0/tests/v2/test_shell_v2.py new/python-glanceclient-0.11.0/tests/v2/test_shell_v2.py --- old/python-glanceclient-0.10.0.21.g7a4a8a0/tests/v2/test_shell_v2.py 2013-09-25 22:02:10.000000000 +0200 +++ new/python-glanceclient-0.11.0/tests/v2/test_shell_v2.py 2013-08-23 17:05:41.000000000 +0200 @@ -70,7 +70,6 @@ 'member_status': 'Fake', 'owner': 'test', 'checksum': 'fake_checksum', - 'tag': 'fake tag' } args = self._make_args(input) with mock.patch.object(self.gc.images, 'list') as mocked_list: @@ -83,7 +82,6 @@ 'member_status': 'Fake', 'visibility': True, 'checksum': 'fake_checksum', - 'tag': 'fake tag' } mocked_list.assert_called_once_with(page_size=18, filters=exp_img_filters) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org