Increase socket timeout for selenium tests

I can reproduce bug 1100771 consistently in my development environment.
Increasing the socket timeout in the SeleniumTestCase class fixes
the timeout issue for me.

This uncovers another issue that causes an "Address already in use
error". This happens because the order of tear down is wrong - we
need to quit() the driver before continuing with tear down rather
than after.

Fixes bug 1100771.

Change-Id: I95fbea05c3fc2516ce4e736eea9b0823bb5bbf79
(cherry picked from commit 5e58a7e388bf593861a63409ee3ccc20b868a9b5)
Bump stable/grizzly next version to 2013.1.3

Change-Id: I304b782b8c6e09f3f8e2232068f42a6112d04e3c
Mark additional strings as translatable

Some variables and templates variables that should be translatable
weren't marked as such.

Fixes bug #1180316

Note the change in horizon/templates/horizon/common/_quota_summary.html
is not backported in this commit to keep the existing translations work.

Change-Id: I90baf19c4bea09c126f8ed225777037194f5331f
(cherry picked from commit acfb83d5d5e45506cb2198869bc9e345f87ff6ea)
Remove deprecated features

When running in httpd, Django complains about deprecations.

Fixes bug 1172222

Change-Id: Ic65b1413bb7745ce45861522fd0cd3c7b688e340
Merge "Increase socket timeout for selenium tests" into stable/grizzly
Merge "Mark additional strings as translatable" into stable/grizzly
Merge "Remove deprecated features" into stable/grizzly
Always return a list from VolumeTableMixIn._get*

Returning None from these methods leads to TypeError
(None is not iterable)

Fixes: bug #1182075
Change-Id: Ia5f5fe78669bbaed599b7dd5cae1beb69bde7796
(cherry picked from commit decee66cb412cafecddc581cd8f229e77a9c6f1a)
Shows a warning message when deleting a container that contains data.

We cannot delete objects in the container since there may be millions
of objects in that. The batch deletion should be done in swift instead
of Horizon. The batch remove of objects function is only in swift CLI
command now. This commit replace the unclear message with a warning
message that tells the user the container is not empy.

Related bug: https://bugs.launchpad.net/horizon/+bug/1034890

Fixes bug: #1096084

Change-Id: I59b46a3535b8654734c3dae4eec916ab1b53c716
(cherry picked from commit eae19c1a7c2303e398b3348651482f49ea7508ce)
Ensure to use keyword parameters in format string in create_instance.py

Fixes bug #1177629

Change-Id: If5a8b74bbcb698f2833ada275be914271dc1b995
(cherry picked from commit 58b0e62cab3b81898719881d4f8d16e094eb4854)
Manually mock service_catalog in stub_keystoneclient

MockObject.__init__ ignores properties, fixes:

FAIL: test_get_default_role (openstack_dashboard.test.api_tests.keystone_tests.RoleAPITests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/var/lib/openstack-dashboard-test/openstack_dashboard/test/api_tests/keystone_tests.py", line 78, in test_get_default_role
    keystoneclient = self.stub_keystoneclient()
  File "/var/lib/openstack-dashboard-test/openstack_dashboard/test/helpers.py", line 287, in stub_keystoneclient
    self.keystoneclient = self.mox.CreateMock(keystone_client.Client)
  File "/usr/lib64/python2.6/site-packages/mox.py", line 258, in CreateMock
    new_mock = MockObject(class_to_mock, attrs=attrs)
  File "/usr/lib64/python2.6/site-packages/mox.py", line 556, in __init__
    attr = getattr(class_to_mock, method)
  File "/usr/lib64/python2.6/site-packages/mox.py", line 608, in __getattr__
    raise UnknownMethodCallError(name)
UnknownMethodCallError: Method called is not a member of the object: service_catalog
>>  raise UnknownMethodCallError('service_catalog')

(cherry picked from commit 82bdecb117877bc0bd1bbd553fbd40d04cbe9078)

Temporary change the django_openstack_auth requirement

The new django_openstack_auth version causes gate job issues like:
http://logs.openstack.org/33618/5/gate/gate-tempest-devstack-vm-full/29950/console.html

Temporary disabling the 1.1.0 version.

(from commit 2ffe032dbf21757bd574dedffa3cd3f6927bbfe3)

Mock some more keystoneclient.Client properties for mox

Fixes LP bug 1196823

Change-Id: I9b0c56eda95ee83cf56a28f2f1b7316ad2592fa2
(cherry picked from commit 2a6d669443b817ced3a98f5bc60a066298b6e40e)
Fix a few visual issues on the network topology diagram.

This commit separates CIDR labels with a comma and adjusts the vertical
positioning of port labels for improved readability.

Change-Id: I57510033fcc309b5d570d7ee6a9369a97775719b
Fixes: bug #1199086
Use default cidr to avoid exception when editing quantum security rules.

$ quantum security-group-rule-create --direction ingress --protocol TCP
--port-range-min 80 --port-range-max 80 web

After creating security group rule with command above, An exception is thrown
when editing the rules for groups web.

Fixes: bug #1165095

Change-Id: If32992622ebc20559dde911455b241937eb59ae6
(cherry picked from commit 706560f6d230334d645ce97301631baaa5c56095)
Sync pytz from requirements.txt

pip 1.4 is imminent, and doesn't install pre-release versions if you
don't ask for them - this includes the date-based version of pytz.

Conflicts:
	requirements.txt

Change-Id: I52fa89005dfedf94a469b3601b3c3d6356eb0174
(cherry picked from commit 5abe67709c61ae705526ee41ef13795216ec1eec)
Show ID for None display name in boot from volume

Fixes bug 1199206.

Change-Id: I5bdbf04d6de1f9d53fa84fad6b7ebae1eb13798a
(cherry picked from commit 52129921003c8da8b46467a6b8d378e60d66ef1d)
Don't duplicate networks list on keypair import

In the Launch Instance modal, if the user clicks on the button to import
a keypair, the networks listed in the Networking tab get duplicated.

The import keypair button calls `workflow_init` which in turn calls
`generate_networklist_html` which appended the networks to the list, not
clearing it beforehand.

This makes sure both Selected Networks and Available Networks lists are
emptied before the networks are added.

Fixes bug 1170193

Change-Id: Icb750caa08673068c509af6c8df1ad57a2a30d93
Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>
(cherry picked from commit 0512a12d07900430e8b399dcc27cade77d390491)
Fix floating IP management from instance panel.

Quantum Floating IP API works with ports ids not instances ones
(opposite to what Nova Network does). So if we want to associate
(disassociate) an allocated floating IP to some instance we must
use the "target_id" (which is a port_id in case of Quantum and an
instance_id in case of Nova network).

Fixes bug 1158596.

Change-Id: Iceba4d8ee74bd58dc1cdbda7668841b0a7eb86f1
(cherry picked from commit de1940c922b0f5fc965a637a9dcf0734530cb85d)
Merge "Fix floating IP management from instance panel." into stable/grizzly
Merge "Use default cidr to avoid exception when editing quantum security rules." into stable/grizzly
Merge "Ensure to use keyword parameters in format string in create_instance.py" into stable/grizzly