Updated openstack/openstack
Project: openstack/cinder  7e9fe3452350f0d63d9325a8af9314e876a206e0
null
NetApp unit test fail fix for http_proxy

The environment having http_proxy settings caused
the unit tests to fail with 404 error. This fix
handles both situations with proxy or without
proxy settings.

Change-Id: I791a45adff654305db9f1fb6f039e91b11ba88d8
Closes-Bug:#1223145
Updated openstack/openstack
Project: openstack/nova  042dc449701ad6fdec04c475b309dd0f072f61ab
null
Utilizes assertIsNone and assertIsNotNone - tests/etc

Using assertTrue and the 'is None' operator to test if an element is None
is too python2.4. Our unit testing framework 'testtools' supports
assertIsNone and assertIsNotNone, included from python 2.7,
which were created for these types of tests.

Change-Id: If3824356ddf4e6e2d91f6bc2fbfa41946d8463cc