A lot of changes to package grizzly-2

.gitreview

@@ -2,4 +2,3 @@
 host=review.openstack.org
 port=29418
 project=openstack/glance.git
-defaultbranch=stable/folsom

debian/control

@@ -14,13 +14,16 @@ Build-Depends-Indep:
  curl,
  openstack-pkg-tools,
  pep8,
+ python-argparse,
  python-boto,
  python-crypto,
+ python-dateutil,
  python-eventlet,
+ python-glanceclient,
  python-httplib2 (>= 0.6.0),
  python-iso8601,
  python-jsonschema,
- python-keystone,
+ python-keystoneclient,
  python-kombu,
  python-migrate,
  python-mox,
@@ -31,7 +34,7 @@ Build-Depends-Indep:
  python-routes,
  python-setuptools,
  python-sphinx,
- python-sqlalchemy (<< 0.8),
+ python-sqlalchemy-ext | python-sqlalchemy (<< 0.6.3-2),
  python-swift,
  python-swiftclient,
  python-webob,
@@ -47,32 +50,66 @@ Architecture: all
 Section: python
 Pre-Depends: dpkg (>= 1.15.6~)
 Depends: ${python:Depends}, ${misc:Depends},
+ python-argparse,
  python-boto,
  python-configobj,
  python-crypto,
+ python-dateutil,
  python-eventlet,
  python-httplib2 (>= 0.6.0),
  python-iso8601,
+ python-jsonschema,
  python-keystone,
  python-kombu,
  python-migrate,
  python-pastedeploy,
+ python-requests,
  python-routes,
- python-sqlalchemy (<< 0.8),
- python-swift,
+ python-setuptools,
+ python-sqlalchemy-ext | python-sqlalchemy (<< 0.6.3-2),
+ python-swiftclient,
  python-webob,
  python-xattr
+Provides: ${python:Provides}
 Description: OpenStack Image Service - Python client library
  The Glance project provides services for discovering, registering, and
  retrieving virtual machine images over the cloud. They may be stand-alone
  services, or may be used to deliver images from object stores, such as
  OpenStack's Swift service, to Nova's compute nodes.
  .
- This package contains the Python client libraries.
+ This package contains the Python libraries.
+
+Package: glance
+Architecture: all
+Section: python
+Pre-Depends: dpkg (>= 1.15.6~)
+Depends: glance-api (= ${source:Version}), glance-registry (= ${source:Version}),
+ ${misc:Depends}
+Description: OpenStack Image Service - metapackage
+ The Glance project provides services for discovering, registering, and
+ retrieving virtual machine images over the cloud. They may be stand-alone
+ services, or may be used to deliver images from object stores, such as
+ OpenStack's Swift service, to Nova's compute nodes.
+ .
+ This is a dependency package to install all of the Glance suite.
+
+Package: python-glance-doc
+Architecture: all
+Section: doc
+Pre-Depends: dpkg (>= 1.15.6~)
+Depends: libjs-jquery, libjs-underscore, ${misc:Depends}
+Description: OpenStack Image Service - Python library documentation
+ The Glance project provides services for discovering, registering, and
+ retrieving virtual machine images over the cloud. They may be stand-alone
+ services, or may be used to deliver images from object stores, such as
+ OpenStack's Swift service, to Nova's compute nodes.
+ .
+ This package contains the documentation.
 
 Package: glance-common
 Architecture: all
 Section: python
+Breaks: glance (<< 2012.1~e2-3)
 Replaces: glance (<< 2012.1~e2-3)
 Pre-Depends: dpkg (>= 1.15.6~)
 Depends: ${python:Depends}, ${misc:Depends},
@@ -100,14 +137,14 @@ Description: OpenStack Image Service - API server
  retrieving virtual machine images over the cloud. They may be stand-alone
  services, or may be used to deliver images from object stores, such as
  OpenStack's Swift service, to Nova's compute nodes.
-  .
+ .
  This package contains the Glance API server.
 
 Package: glance-registry
 Architecture: all
 Section: python
-Pre-Depends: adduser, dpkg (>= 1.15.6~)
-Depends: ${ostack-lsb-base}, ${python:Depends}, ${misc:Depends},
+Pre-Depends: dpkg (>= 1.15.6~)
+Depends: adduser, ${ostack-lsb-base}, ${python:Depends}, ${misc:Depends},
  glance-common (= ${source:Version}),
  dbconfig-common
 Description: OpenStack Image Service - registry server
@@ -117,30 +154,3 @@ Description: OpenStack Image Service - registry server
  OpenStack's Swift service, to Nova's compute nodes.
  .
  This package contains the Glance registry server.
-
-Package: glance
-Architecture: all
-Section: python
-Pre-Depends: dpkg (>= 1.15.6~)
-Depends: glance-api (= ${source:Version}), glance-registry (= ${source:Version}),
- ${misc:Depends}
-Description: OpenStack Image Service - metapackage
- The Glance project provides services for discovering, registering, and
- retrieving virtual machine images over the cloud. They may be stand-alone
- services, or may be used to deliver images from object stores, such as
- OpenStack's Swift service, to Nova's compute nodes.
- .
- This is a dependency package to install all of the Glance suite.
-
-Package: python-glance-doc
-Architecture: all
-Section: doc
-Pre-Depends: dpkg (>= 1.15.6~)
-Depends: libjs-jquery, libjs-underscore, ${misc:Depends}
-Description: OpenStack Image Service - Python library documentation
- The Glance project provides services for discovering, registering, and
- retrieving virtual machine images over the cloud. They may be stand-alone
- services, or may be used to deliver images from object stores, such as
- OpenStack's Swift service, to Nova's compute nodes.
- .
- This package contains the Python client library documentation.

debian/glance-api.logrotate

@@ -1,4 +1,4 @@
-/var/log/glance/glance-api.log {
+/var/log/glance/api.log {
     daily
     missingok
     compress

debian/glance-api.manpages

@@ -3,4 +3,4 @@ doc/build/man/glance-cache-cleaner.1
 doc/build/man/glance-cache-manage.1
 doc/build/man/glance-cache-prefetcher.1
 doc/build/man/glance-cache-pruner.1
-doc/build/man/glance-scrubber.1
+doc/build/man/glance-scrubber.1

debian/glance-common.dirs

@@ -1,7 +1,7 @@
-/var/lib/glance/
-/var/lib/glance/image-cache/
+/var/lib/glance
+/var/lib/glance/image-cache
 /var/lib/glance/image-cache/incomplete
 /var/lib/glance/image-cache/invalid
 /var/lib/glance/image-cache/queue
-/var/lib/glance/images/
-/var/log/glance/
+/var/lib/glance/images
+/var/log/glance

debian/glance-registry.install

@@ -1 +1,2 @@
 usr/bin/glance-registry
+usr/bin/glance-replicator

debian/glance-registry.logrotate

@@ -1,4 +1,4 @@
-/var/log/glance/glance-registry.log {
+/var/log/glance/registry.log {
     daily
     missingok
     compress

debian/patches/fixed-most-pep8-errors.patch

@@ -1,39 +0,0 @@
-Description: Fixe most pep8 errors.
-Author: Thomas Goirand <zigo@debian.org>
-Forwarded: not-needed
-
---- a/glance/common/utils.py
-+++ b/glance/common/utils.py
-@@ -386,7 +386,7 @@
- 
-     height_width = func.get(platform.os.name, _get_terminal_size_unknownOS)()
- 
--    if height_width == None:
-+    if height_width is None:
-         raise exception.Invalid()
- 
-     for i in height_width:
---- a/glance/db/sqlalchemy/migrate_repo/versions/003_add_disk_format.py
-+++ b/glance/db/sqlalchemy/migrate_repo/versions/003_add_disk_format.py
-@@ -93,8 +93,8 @@
-         images.outerjoin(image_properties,
-                          and_(images.c.id == image_properties.c.image_id,
-                               image_properties.c.key == 'type'))]).where(
--            and_(image_properties.c.image_id == None,
--                 images.c.type != None))
-+            and_(image_properties.c.image_id is None,
-+                 images.c.type is not None))
-     image_records = conn.execute(sel).fetchall()
-     property_insert = image_properties.insert()
-     for record in image_records:
---- a/glance/db/sqlalchemy/migrate_repo/versions/010_default_update_at.py
-+++ b/glance/db/sqlalchemy/migrate_repo/versions/010_default_update_at.py
-@@ -64,7 +64,7 @@
-     conn = migrate_engine.connect()
-     conn.execute(
-         images_table.update(
--            images_table.c.updated_at == None,
-+            images_table.c.updated_at is None,
-             {images_table.c.updated_at: images_table.c.created_at}))
- 
- 

debian/patches/series

@@ -1,6 +1,4 @@
-test_interrupt_avoids_respawn_storm.patch
 default_conf.patch
 disable-network-for-docs.patch
 sql_conn-registry.patch
-fixed-most-pep8-errors.patch
 dont-rely-on-network.patch

debian/patches/test_interrupt_avoids_respawn_storm.patch

@@ -1,27 +0,0 @@
-Description: Fixes test_multiprocessing.py to work on pbuilder environments
-Author: Ghe Rivero
-Forwarded: no
-
---- a/glance/tests/functional/v1/test_multiprocessing.py
-+++ b/glance/tests/functional/v1/test_multiprocessing.py
-@@ -43,8 +43,9 @@
-         self.stop_servers()
- 
-     def _get_children(self):
--        cmd = ("ps -fu $USER | grep glance-api | "
--               "grep -v grep | awk '{print $2}' | sort -nr")
-+        cmd = ("pgrep -u $USER -f glance-api || "
-+               "pgrep -u pbuilder -f glance-api || "
-+               "pgrep -u 1234 -f glance-api")
-         _, out, _ = execute(cmd, raise_error=True)
-         return out.split('\n')[0:2]
- 
-@@ -58,7 +59,7 @@
- 
-         children = self._get_children()
-         cmd = "kill -INT %s" % ' '.join(children)
--        execute(cmd, raise_error=True)
-+        execute(cmd, raise_error=False)
- 
-         for _ in range(0, 9):
-             # Yeah. This totally isn't a race condition. Randomly fails

debian/pydist-overrides

@@ -0,0 +1,4 @@
+pysendfile
+jsonschema
+argparse
+python_swiftclient

debian/rules

@@ -9,7 +9,7 @@ include /usr/share/openstack-pkg-tools/pkgos.make
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	bash run_tests.sh -N || true
+	bash run_tests.sh -N glance/tests || true
 endif
 
 override_dh_auto_build:

glance/tests/functional/test_scrubber.py

@@ -226,54 +226,3 @@ class TestScrubber(functional.FunctionalTest):
             self.fail('image was never scrubbed')
 
         self.stop_servers()
-
-    def test_scrubber_app(self):
-        """
-        test that the glance-scrubber script runs successfully when not in
-        daemon mode
-        """
-        self.cleanup()
-        self.start_servers(delayed_delete=True, daemon=False)
-
-        client = self._get_client()
-        registry = self._get_registry_client()
-
-        # add some images and ensure it was successful
-        img_ids = []
-        for i in range(0, 3):
-            meta = client.add_image(TEST_IMAGE_META, TEST_IMAGE_DATA)
-            id = meta['id']
-            img_ids.append(id)
-        filters = {'deleted': True, 'is_public': 'none',
-                   'status': 'pending_delete'}
-        recs = registry.get_images_detailed(filters=filters)
-        self.assertFalse(recs)
-
-        # delete those images
-        for img_id in img_ids:
-            client.delete_image(img_id)
-        recs = registry.get_images_detailed(filters=filters)
-        self.assertTrue(recs)
-
-        filters = {'deleted': True, 'is_public': 'none'}
-        recs = registry.get_images_detailed(filters=filters)
-        self.assertTrue(recs)
-        for rec in recs:
-            self.assertEqual(rec['status'], 'pending_delete')
-
-        # wait for the scrub time on the image to pass
-        time.sleep(self.api_server.scrub_time)
-
-        # scrub images and make sure they get deleted
-        cmd = ("bin/glance-scrubber --config-file %s" %
-               self.scrubber_daemon.conf_file_name)
-        exitcode, out, err = execute(cmd, raise_error=False)
-        self.assertEqual(0, exitcode)
-
-        filters = {'deleted': True, 'is_public': 'none'}
-        recs = registry.get_images_detailed(filters=filters)
-        self.assertTrue(recs)
-        for rec in recs:
-            self.assertEqual(rec['status'], 'deleted')
-
-        self.stop_servers()

glance/tests/functional/v2/test_images.py

@@ -345,12 +345,6 @@ class TestImages(functional.FunctionalTest):
         self.assertEqual(200, response.status_code)
         self.assertEqual(response.text, 'ZZZZZ')
 
-        # Image data should still be present after the failed delete
-        path = self._url('/v2/images/%s/file' % image_id)
-        response = requests.get(path, headers=self._headers())
-        self.assertEqual(200, response.status_code)
-        self.assertEqual(response.text, 'ZZZZZ')
-
         self.stop_servers()
 
     def test_tag_lifecycle(self):

glance/tests/unit/v2/test_images_resource.py

@@ -433,12 +433,6 @@ class TestImagesController(test_utils.BaseTestCase):
         self.assertRaises(webob.exc.HTTPNotFound, self.controller.update,
                           request, UUID1, changes=[])
 
-    def test_update_deleted_image_admin(self):
-        request = unit_test_utils.get_fake_request(is_admin=True)
-        self.controller.delete(request, UUID1)
-        self.assertRaises(webob.exc.HTTPNotFound, self.controller.update,
-                          request, UUID1, changes=[])
-
     def test_update_replace_base_attribute(self):
         self.db.image_update(None, UUID1, {'properties': {'foo': 'bar'}})
         request = unit_test_utils.get_fake_request()
@@ -681,12 +675,6 @@ class TestImagesController(test_utils.BaseTestCase):
         self.assertRaises(webob.exc.HTTPNotFound, self.controller.delete,
                           request, UUID4)
 
-    def test_delete_already_deleted_image_admin(self):
-        request = unit_test_utils.get_fake_request(is_admin=True)
-        self.controller.delete(request, UUID1)
-        self.assertRaises(webob.exc.HTTPNotFound,
-                          self.controller.delete, request, UUID1)
-
     def test_index_with_invalid_marker(self):
         fake_uuid = uuidutils.generate_uuid()
         request = unit_test_utils.get_fake_request()