26066 Commits

Author SHA1 Message Date
Jenkins
5aa0cac98f Merge "Update log message to support translations" 2014-02-17 09:30:42 +00:00
Jenkins
b63e2f4143 Merge "Add "body=" argument to v3 API unit tests" 2014-02-17 08:43:15 +00:00
Jenkins
fac4532c8f Merge "Make floating_ips module use Service object" 2014-02-15 17:07:17 +00:00
Jenkins
d07ba2af6f Merge "Make floating_ips module use Instance object" 2014-02-15 16:17:26 +00:00
Jenkins
b77154a23b Merge "Make floating_ips module use Network object" 2014-02-15 16:12:35 +00:00
OpenStack Jenkins
16afbe1964 Merge "Imported Translations from Transifex" 2014-02-15 15:32:24 +00:00
Jenkins
5a2632edbe Merge "Make floating_ips module use FixedIP object" 2014-02-15 08:51:29 +00:00
Jenkins
538a470151 Merge "Count memory and disk slots once in cells state manager" 2014-02-15 08:32:16 +00:00
OpenStack Jenkins
b1f5be18d2 Imported Translations from Transifex
Change-Id: I05e8b0042f792db0ee164f014141ea0d7c97d675
2014-02-15 06:13:42 +00:00
Jenkins
691ccea82b Merge "XenAPI: Report the CPU details correctly" 2014-02-15 06:05:04 +00:00
Jenkins
4e683ffd90 Merge "fix ips to 'ips' in APIRouter" 2014-02-15 06:03:58 +00:00
Jenkins
4114f1c712 Merge "report port number for address already in use errors" 2014-02-15 05:04:03 +00:00
Jenkins
0b0716cf15 Merge "Add API schema for v3 rescue API" 2014-02-15 01:53:21 +00:00
Jenkins
80af73c36b Merge "Corrected typo in metrics" 2014-02-15 01:52:16 +00:00
Jenkins
29224e1bdd Merge "Fixed incorrect test case of test_server_metadata.py" 2014-02-15 01:13:03 +00:00
Jenkins
9dd8050770 Merge "ec2 api should check 'max_count'&'min_count' para" 2014-02-15 01:12:05 +00:00
Jenkins
a1f85f1d89 Merge "compute: removes unnecessary condition" 2014-02-15 00:13:40 +00:00
Dan Smith
6314435abd Make floating_ips module use Service object
This makes the network.floating_ips module use the Service object
for its query instead of direct database access.

Related to blueprint nova-network-objects

Change-Id: I612b032824d828cf2104dd281bb88a4ecba6c8b6
2014-02-14 15:45:26 -08:00
Dan Smith
ba4f9b60a5 Make floating_ips module use Instance object
This makes the network.floating_ips module use the Instance object
for queries instead of direct database access.

Related to blueprint nova-network-objects

Change-Id: I213ff4476c3e8277f9df09941e24a1374a1aa569
2014-02-14 15:45:26 -08:00
Dan Smith
d0803e2534 Make floating_ips module use Network object
This makes the network.floating_ips module use the Network object
instead of going direct to the database.

Related to blueprint nova-network-objects

Change-Id: I589881515fa43f9527a466f9eb22df2768ef3f3a
2014-02-14 15:45:26 -08:00
Dan Smith
9526bd611e Make floating_ips module use FixedIP object
This makes the network.floating_ips module use the FixedIP
objects instead of direct database interaction.

Related to blueprint nova-network-objects

Change-Id: I09505d480bae0f764b1edf92722e1d2ed1652e61
2014-02-14 15:45:26 -08:00
Jenkins
43a00e4c04 Merge "Make nova_ipam_lib use Network, FixedIP, and FloatingIP objects" 2014-02-14 21:19:54 +00:00
Jenkins
69219acd7d Merge "Make nova-network use FixedIP for timeouts" 2014-02-14 20:23:17 +00:00
Jenkins
311652325b Merge "Make nova-network use FixedIP object for updates" 2014-02-14 19:35:15 +00:00
Jenkins
b66a092a7a Merge "Make nova-network use FixedIP object for disassociations" 2014-02-14 18:40:28 +00:00
Jenkins
215d646177 Merge "Replace oslo.sphinx with oslosphinx" 2014-02-14 17:34:18 +00:00
Jenkins
a1fe8dfd58 Merge "Convert unrescue_instance to objects" 2014-02-13 20:20:36 +00:00
Jenkins
bf0c24c070 Merge "Don't allow compute_node free_disk_gb to be None" 2014-02-13 17:31:22 +00:00
Andrew Laski
3720fd17b0 Count memory and disk slots once in cells state manager
If multiple instance types in a cell had the same memory_mb value or
root_gb + ephemeral_gb added to the same value, then capacity counts
would be inaccurate since slots would get counted multiple times.
Rather than counting based on instance type it is now based on the set
of memory or disk values pulled from instance types.

Change-Id: Iaded7fa69dadb4aa0335ef1569975bdfcb2767c6
Closes-bug: #1276728
2014-02-13 10:40:14 -05:00
Michael Still
ec78b42d7b Convert unrescue_instance to objects
Related to blueprint icehouse-objects.
Related to blueprint compute-manager-objects.

Change-Id: Id1311064354ee055a3557ce6aafca148c76524ec
2014-02-14 01:19:31 +11:00
Mark McLoughlin
6aa36ab382 Don't allow compute_node free_disk_gb to be None
As part of commit 5668870, we now explicitly guard against the case
free_disk_gb is None or unset. However, this should never happen
since resource tracker always sets it and guarding against this case
isn't actually needed to fix the bug in question.

Also, simplify the code a little to make the intent more clear. We
assume that free_disk_gb is always set, but we want to use
disk_available_least where the driver has set it. The case where
disk_available_least is less than free_disk_gb is the exceptional
case we want to guard against.

Change-Id: I3973eab6b4ca016df546de8b57245fc0d0f03a80
2014-02-13 12:26:24 +00:00
Jenkins
7d95d729a3 Merge "Correct host managers free disk calculation" 2014-02-13 12:10:22 +00:00
Jenkins
b541ecc36b Merge "Change assertTrue(isinstance()) by optimal assert" 2014-02-13 11:11:04 +00:00
Sahid Orentino Ferdjaoui
de4099feda compute: removes unnecessary condition
An unnecessary condition is used in compute/manager.py

Change-Id: If1a27009079721198aebebbd8c1c773f10f51f1a
2014-02-13 10:32:57 +01:00
Jenkins
a287beab73 Merge "Fix baremetal stats type" 2014-02-13 06:26:40 +00:00
Jenkins
91b17d8daf Merge "VMware: fix bug for exceptions thrown in _wait_for_task" 2014-02-13 02:11:34 +00:00
Jenkins
d96a6ddb86 Merge "Adds migrate server extension for V3 API" 2014-02-13 01:12:40 +00:00
Jenkins
094dadfe6f Merge "Make image props filter handle old vm_modes" 2014-02-12 22:37:57 +00:00
Jenkins
111d1d97bf Merge "Set a sane default for state_path" 2014-02-12 22:04:35 +00:00
Jenkins
4e7db76cef Merge "Move policy check of start/stop to api layer" 2014-02-12 21:05:19 +00:00
Ben Nemec
c926216a9b Replace oslo.sphinx with oslosphinx
oslosphinx is now available as a replacement for oslo.sphinx that
won't conflict with oslo.config in virtual envs.

Change-Id: I7c116f816af895261e76af385ee3e9288e6fa70f
Closes-Bug: #1277168
2014-02-12 16:45:49 +00:00
Marcos Lobo
d5e8f1af67 Change assertTrue(isinstance()) by optimal assert
Some of tests use different method of assertTrue(isinstance(A, B)) or
assertEqual(type(A), B). The correct way is to use assertIsInstance(A,
B) provided by testtools.

Change-Id: I4a5413f9d90d2e581044885a440a46bf3d76598f
Closes-Bug: #1268480
2014-02-12 16:19:08 +01:00
Dan Smith
2a916819f3 Make nova_ipam_lib use Network, FixedIP, and FloatingIP objects
This makes nova_ipam_lib use objects for almost everything except
for VIF-related functions, which is coming soon.

Related to blueprint nova-network-objects

Change-Id: Ib39bbc86921eeb849e715a205dccaab3aad6d1c6
2014-02-12 06:34:42 -08:00
Dan Smith
9776175fc3 Make nova-network use FixedIP for timeouts
This makes nova-network manager use the FixedIP object when
disassociating addresses due to timeout.

Related to blueprint nova-network-objects

Change-Id: I909f710543239207f6d27230b527b4495a23f2cb
2014-02-12 06:34:42 -08:00
Dan Smith
542958fac7 Make nova-network use FixedIP object for updates
This makes nova-network manager use the FixedIP object for
updates instead of direct database calls.

Related to blueprint nova-network-objects

Change-Id: Ia191148cf7510ffdb0fbd4186fa34bb4c5ab1b0f
2014-02-12 06:34:42 -08:00
Dan Smith
79121d9a11 Make nova-network use FixedIP object for disassociations
This makes nova-network mananger use the FixedIP object for
disassociating IPs.

Related to blueprint nova-network-objects

Change-Id: Ia0a38bbd31cc22095893bff89bcaa402a9bc2722
2014-02-12 06:34:42 -08:00
Jenkins
8bc9586056 Merge "Add hpet option for time drifting" 2014-02-12 13:28:37 +00:00
Jenkins
93b0fc130a Merge "libvirt: Adds missing tests to copy_image" 2014-02-12 10:59:44 +00:00
Ken'ichi Ohmichi
4c1b1a893e Add "body=" argument to v3 API unit tests
This patch adds "body=" argument to v3 API unit tests for avoiding
the test failures due to KeyError when applying the API validation
framework to "create a server" API.

_process_stack() of nova's wsgi passes kwargs which includes 'body'
like:
    {'body': {u'server': {u'name': u'my-server', [..]}}}
to an API method. The validation framework finds a body with the
keyword 'body' from the kwargs, and validates the body with the API
schema. So this changes is also for fitting the arguments to the wsgi
behavior.

Partially implements blueprint nova-api-validation-fw

Change-Id: Id5fa416e021b529e20aca3701e3f159bb316e7fb
2014-02-12 19:01:45 +09:00
Jenkins
5daea2e8e0 Merge "Delete baremetal image files after deployment." 2014-02-12 08:49:29 +00:00