2273 Commits

Author SHA1 Message Date
Michael J Fork
802af0fe04 Allow description fields to be translated in schema
The description fields for the schema elements were hard coded
english strings but are intended for end user consumption and
should be translation enabled.

bug 1115495
Change-Id: Ic3b16af75a41a186640762d0c7af787f1bf49ad0
2013-02-04 19:03:59 +00:00
Jenkins
7feecf19ea Merge "Pull in tarball version fix from oslo." 2013-01-31 16:59:30 +00:00
Jenkins
199d139ee1 Merge "Fixes 'not in' operator usage" 2013-01-31 16:02:58 +00:00
Zhongyue Luo
d7be5c1982 Fixes 'not in' operator usage
Fixes bug #1111254

Change-Id: I297829049213732217332a969aa107525ac13600
2013-01-31 23:02:09 +08:00
Jenkins
73ffec0726 Merge "Prints list-cached dates in isoformat" 2013-01-31 14:53:06 +00:00
Jenkins
a4e89f1a43 Merge "Fix kwargs in xattr BadDriverConfiguration exc." 2013-01-31 14:23:49 +00:00
Jenkins
dfbdd5f457 Merge "Fail sensibly if swiftclient absent in test" 2013-01-31 04:01:43 +00:00
Monty Taylor
7ea5be5952 Stop using detailed-errors plugin for nose.
Because of the move to testtools, the detailed-errors plugin is not only no
longer useful, it actually causes problems, as it fails to process the
error information sent up by testtools.

Part of blueprint grizzly-testtools

Change-Id: I0c8ff489fa92bb4cf7dcd06dd73f14701c013608
2013-01-31 10:50:36 +11:00
Jenkins
f84c488274 Merge "Initialize CONF properly in store func tests" 2013-01-30 22:32:51 +00:00
Dan Prince
8291e3cf1b Fix kwargs in xattr BadDriverConfiguration exc.
Updates an exception in the xattr image_cache driver so that
it uses the correct kwargs for message formatting.

Change-Id: I045de0fcd0237ed2702cf13d911d5b14ea86f45b
2013-01-30 10:46:48 -05:00
Jenkins
2fdd1df173 Merge "Ensure swift_store_admin_tenants ACLs are set" 2013-01-29 21:13:10 +00:00
Flaper Fesp
35be498112 Prints list-cached dates in isoformat
Converts dates printed by list-cached to a human readable format
(isoformat). It now checks whether the image last_access time is == 0.0
and prints "Not Accessed Yet" if so.

* Updates openstack.common.timeutils
* Fixes bug 1102334

Change-Id: I46f023471ec87fdf74c18f33309279a2f39a4e2a
2013-01-29 18:34:37 +01:00
Brian Waldon
6d90682019 Fail sensibly if swiftclient absent in test
Change-Id: Ie44940ede03b6b3d5cff0214dec5d63645fbb584
2013-01-29 08:58:35 -08:00
Brian Waldon
445ae7cbce Initialize CONF properly in store func tests
Change-Id: I49b42cc3da15d0966e34a57cfae0bbed79927c7a
2013-01-29 08:58:08 -08:00
Stuart McLaren
1b54093410 Ensure swift_store_admin_tenants ACLs are set
When using the V1 api ensure that admin tenant ACLs are set
correctly on the relevant swift container.

Fixes bug 1109089.

Change-Id: I275e8aa7d2f02859c0d9ddbf373a0ae51e81e53d
2013-01-29 16:46:46 +00:00
Dan Prince
e96273112b Remove Swift location/password from messages.
Updates several exceptions and log messages in the Swift backend
so that they don't include Swift location URI's which may contain
passwords when used in Swift single tenant mode.

Fixes LP Bug #1098962.

Change-Id: I458de58563343347d5c976fe1ad084cc7e3280eb
2013-01-29 09:54:56 -05:00
Leam
1c01cf1c43 Removed unnecessary code
Modified glance/registry/client.py.
Replaced image_metadata.keys() with image_metadata

Change-Id: I1e80ec476a8a23d9935ec9d111d652781cad320c
2013-01-25 16:57:48 -05:00
Andrew Tranquada
71668fd383 Removed unncessary code
no need to call .keys()
if fixture_key not in reads more cleanly

Change-Id: I27108fb7c1b71cb7a328a35d82d79a9da4786171
2013-01-25 16:13:16 +00:00
Jenkins
2517f1e540 Merge "Make v2 image tags test not load system policy" 2013-01-25 01:27:07 +00:00
Jenkins
2bd2513fb4 Merge "Update glance config files with log defaults" 2013-01-25 01:27:02 +00:00
Jenkins
4552b7eccb Merge "Log exception details." 2013-01-24 21:30:11 +00:00
Jenkins
ce06d849f4 Merge "Sync latest cfg and log from oslo-incubator" 2013-01-24 21:17:48 +00:00
Monty Taylor
94969ae8a1 Pull in tarball version fix from oslo.
Fixes bug 1103473.

Change-Id: I6ba67c2a8a0b7f3d488dc294882ef9f2c925bbf5
2013-01-25 08:16:13 +11:00
Chris Allnutt
1c04ac0ad0 Updated image loop to not use an enumerator
*  We are not using the enumerator in the loop. So this has been rewritten to not use it.

Change-Id: I18cab2556190e8ce5c202c5f5e7b8e6b3dfe8f59
2013-01-24 19:57:26 +00:00
jola-mirecka
4a5883eb24 Log exception details.
When there is an error while initializing the backing store,
log entrires are now displaying more details specifying
the reason of failure.

Also instead of normal info message, log entries display
warnings in this case.

Fixes: bug #1103073
Change-Id: Icb7cc3c27325cfb0e4d62f466d28ecf9995d91ac
2013-01-24 11:03:12 +00:00
Jenkins
c5e04950a0 Merge "Revert "Avoid testtools 0.9.25"" 2013-01-23 22:37:04 +00:00
Chuck Short
21cf2cf395 Update version code from oslo
Pull in a versioning fix from openstack-common, fixes
python setup.py sdist versioning.

Change-Id: I9ffab5c2b37190b4c7daad5e92da40d773c99b4f
Signed-off-by: Chuck Short <chuck.short@canonical.com>
2013-01-21 21:17:51 -06:00
Robert Collins
1c1efe12f9 Revert "Avoid testtools 0.9.25"
This reverts commit acae86293f7b0bba8fe105779f6f75df3af9ec51.
Testtools upstream is fixed.

Change-Id: Idc5f51bef76e31d627a80c742f5587d51e373d22
2013-01-22 09:05:49 +13:00
Johannes Erdfelt
acae86293f Avoid testtools 0.9.25
Fixes bug 1102400

testtools 0.9.25 introduces a new dependency on the 'extras' package, but
it does so in a way to prevents itself from being installed without the
'extras' package already installed.

Work around the problem for now by avoiding the problematic release.

Change-Id: If8aa3925c744fad88f6f2715b5e779d0c258524c
2013-01-21 17:06:16 +00:00
Mark McLoughlin
5e672def89 Update glance config files with log defaults
The default for the verbose config option is False and the sample config
file should reflect that.

Also, comment out the defaults of the config options so that it is clear
that the sample file is showing the default in the code rather than
overriding it.

Change-Id: I3913ea54465658d93dc56e014dfe5d911b0541d6
2013-01-21 16:58:33 +00:00
Mark McLoughlin
79efac44b4 Sync latest cfg and log from oslo-incubator
Changes include:

  c5984ba Move logging config options into the log module
  751c35b Verbose should not enable debug level logging
  edcdd25 Improve millisecond logging
  a8973c5 Revert "Support lookup of value using "group.key""

The most significant of these changes is defaulting to the WARNING log
level which was discussed on openstack-dev:

  http://lists.openstack.org/pipermail/openstack-dev/2013-January/004223.html

This is behaviour already documented in doc/source/configuring.rst at
least.

Fixes bug #989269

DocImpact

Change-Id: I8ed9107193a811f50ecfd9b34e99e933774405ab
2013-01-21 15:46:39 +00:00
Mark McLoughlin
c5d7ea90ee Make v2 image tags test not load system policy
Since commit 74a8601, I'm seeing this test attempting to load
/etc/glance/policy.conf.

Switch to using IsolatedUnitTest which copies the policy into a
temp dir.

Change-Id: Ibd84ed753de5abf91ee597918ba56130ddd0550e
2013-01-21 15:45:04 +00:00
Monty Taylor
43f8697696 Replace custom tearDown with fixtures and cleanup.
testtools.addCleanup is a more resilient way to perform cleanup activities,
as it will continue to clean things up even if there are unforseen problems.

Specifically, replace custom management of tempdirs with fixtures.TempDir
and replace tearDown methods that can be easily replaced with calls to
addCleanup in the setUp method. There are at least two temp dir creations that
did not have a corresponding cleanup in this patch, which is another reason
for using useFixture(fixtures.TempDir) instead of calls to mkdtemp.

Part of blueprint grizzly-testtools.

Change-Id: I4eb548010612bd5a8d30e8e2304fa66d3d5ffb7c
2013-01-17 16:39:40 -05:00
Jenkins
3de221b9db Merge "Update version code from oslo." 2013-01-16 21:43:25 +00:00
Jenkins
5c8a3c1e61 Merge "Relax version constraint on Webob-1.0.8" 2013-01-16 21:09:04 +00:00
Jenkins
4f9bd427e2 Merge "Stub out find_file... fix policy.json test issue." 2013-01-16 19:16:29 +00:00
Jenkins
8f795f5176 Merge "Use testtools for unittest base class." 2013-01-15 19:15:40 +00:00
Jenkins
b3cf405b61 Merge "Update v1/images DELETE so it returns empty body." 2013-01-14 23:32:57 +00:00
Monty Taylor
1aaacf9c63 Update version code from oslo.
Change-Id: Ibe96c6783203dc01d231c5ba990159a089ee27ba
2013-01-13 14:27:48 -08:00
Monty Taylor
b5e60b7e78 Use testtools for unittest base class.
While doing this, remove some of the nose-isms, which don't play nicely.

Part of blueprint grizzly-testtools

Change-Id: I9ea398b25195ad5f9c5db876c3dbb49ef4a5ee99
2013-01-12 19:17:08 +00:00
Jenkins
2d9b3f142c Merge "Add import for filesystem_store_datadir config." 2013-01-12 01:00:57 +00:00
Dan Prince
8726801d89 Stub out find_file... fix policy.json test issue.
Updates test_policy.py so that we stub out find_file
which is used to find the *default* policy file. This
fixes an issue in the test_policy_file_default_not_found
test where it *may* fail when executed on a machine with
Glance package(s) installed (thus created a file in /etc/glance/
that isn't readable by the test user).

Fixes LP Bug #1098687.

Change-Id: If2912d40608ffb07f457454fdc6ebc56c62f6eaf
2013-01-11 16:09:25 -08:00
Toan Nguyen
26a13983b8 Remove unused declaration in images.py
Change-Id: Ief73484594f7fe0d80ffeb64b494f1691716418b
2013-01-11 14:45:13 -05:00
Dan Prince
cf97f6f1aa Add import for filesystem_store_datadir config.
Adds a missing CONF import for the filesystem_store_datadir.
This is required in order to make the policy tests (test_policy.py)
run as a stand alone suite.

Fixes: NoSuchOptError: no such option: filesystem_store_datadir

Fixes LP Bug #1098670.

Change-Id: If8f9db3962b070e7841e4e3ef531dda4645624b7
2013-01-11 13:04:38 -05:00
Dan Prince
8b1c02a078 Update v1/images DELETE so it returns empty body.
Fixes an issue in the v1/images controller where a delete
response would contain a 'null' string instead of an empty
request body.

Fixes LP Bug #1098651.

Change-Id: I1a6610fe92e3a7f1221ca6f3e5f9e2c5e6130fbe
2013-01-11 12:18:34 -05:00
Sascha Peilicke
1522be7765 Relax version constraint on Webob-1.0.8
And set it to WebOb 1.2 or later instead. This is consistend with requirements
in other projects.

Change-Id: I3f6c2a632d933b31baa781e367eaf615cb7b8ee9
2013-01-11 10:01:01 +01:00
Jenkins
a1a4862ecb Merge "Update common openstack code from oslo-incubator" 2013-01-11 02:29:58 +00:00
Mark J. Washenberger
f792daf2cf Set content-length despite webob
Webob has a tendency to wipe out the content-length we set on responses.
This causes eventlet to use chunked transfer encoding. By changing the
order of operations, however, we can trigger eventlet to use the simpler
and more informative Content-Length header.

Change-Id: I0ed27c9e668a538bc0fc29cb6e9127dfb7fd8c78
2013-01-09 16:30:01 -08:00
Jenkins
c8e6d90ee6 Merge "Modify the v2 image tags to use domain model" 2013-01-09 23:24:11 +00:00
Brian Waldon
a336e59b44 Update common openstack code from oslo-incubator
* Update to oslo-incubator commit b17b268a269c4989d76267db5c2d49d4c20bd51d.
* Update usage of 'deferred_version_string' to 'cached_version_string'
* Add context values 'user' and 'tenant' for context-logging
* Remove prefixes that resolve to '%prog' in --version CLI output

Change-Id: I24d9a24ad1a6e9379008ea719c9cbd22899111f9
2013-01-09 11:16:59 -08:00