Merge "Synced jsonutils and its dependencies"
make lifecycle event logs more clear

Instead of logging integers in a cryptic way, log the human
readable strings for VM event state transitions. Also use the
existing instance_uuid port of the logger instead of putting that
separately into our log message.

Change-Id: I96c39ad4494aa06a8dd5bd942c669a16836a8b9c
Remove a not used function _get_ip_by_id

There is a not used function in floating_ips.py, Remove it
since no one use it.

Change-Id: I6a45c73d9e2a897fdc45f00e7363db204663cd3c
Fixed wrong assertion in test_vmops.py

There is wrong assert method in
nova.tests.virt.vmwareapi.vmwareapi.test_vmops.py:640
while checking a number of calls mocked method 'mkdir'.

We should use assertEqual(3, len(mock_mkdir.mock_calls))
instead of self.assertTrue(3, len(mock_mkdir.mock_calls))

But number of calling method 'mkdir' not always is 3.
If dict block_device_info contains key 'block_device_mapping'
with any information, method 'mkdir' wouldn't be called in method
self._vmops.spawn(). That is why corresponding check been added.

Change-Id: Ifc26e112b9c2974e0fb7a91ba39d5b2d887bd549
Closes-Bug: #1335859
Merge "Remove duplicate code in Objects create() function"
Merge "Fix exception raised when a requested console type is disabled"
Skip none value attributes for ec2 image bdm output.

Fix crash in _format_block_device_mapping when there are None values
for formatting attributes in the mapping.

Change-Id: I0ebdb844d75cdf1580cc88e1ff40fc21aff96f21
Closes-Bug: #1323403
Merge "vmware: Refactor: fold volume_util.py into volumeops.py"
Pass instance object into _shutdown_instance()

The compute manager _shutdown_instance() method can take
instance objects so there is no need for _delete_instance() to
pass an instance dict anymore.

Related to blueprint compute-manager-objects-juno

Change-Id: I2294ea03a4e648e0427446fb7baca70f5f5fb221
Be explicit about objects in _shutdown_instance()

This adds a docstring to _shutdown_instance() making it clear that
it takes an Instance object. Also, pass an object to the method
from the test.

Related to blueprint compute-manager-objects-juno

Change-Id: Ia80c82ca0f5d8a470bb8f01f1520a82748a4f877
Neutronv2 api does not support neutron without port quota

If quota on ports are disabled in neutron (see below), neutronv2 api
set port quota to None and quota check raises a TypeError.

  # neutron server /etc/neutron/neutron.conf
  [quotas]
  quota_items=network,subnet,router,floatingip

This change set port quota to -1 (unlimited) if quota on ports are
disabled.

Change-Id: I89c530dd57a7beb35695be124ca8511148378458
Closes-Bug: #1333315
Merge "vmware: Reuse existing StorageError class"
Merge "vmware: Use exc_info when logging exceptions"
Merge "make lifecycle event logs more clear"
Sync oslo lockutils to nova

The commit to be merged:

5c11c4d0 Don't import fcntl on Windows
de4adbc4 pep8: fixed multiple violations
9e88af17 fixed typos found by RETF rules

Related-bug: #1335897

Change-Id: Iec4cbb5fa7265b181a851f6ebfac9cd7c5685ed7
Merge "Pass instance object into _shutdown_instance()"
add repr for event objects

When an event object gets dumped in a stack trace, because there
is no __repr__ of it, we don't get any details about what it was.
Add a __repr__ to all the event objects so that we can get this
information on a fail.

Change-Id: I9a62a4348871b748c53b7354ad1b821fe987127d
Merge "Fix rest of compute objects usage"
Merge "Fix rest of API objects usage"
Merge "Sync oslo lockutils to nova"