A nova/oslo.messaging rebase

gistfile1.txt

commit: de2218e
merge-base: ce71b66
onto: d34a04d

git diff ce71b66..d34a04d

CONFLICT (content): Merge conflict in requirements.txt
 - easy

CONFLICT (content): Merge conflict in nova/utils.py
 - six import was added

CONFLICT (content): Merge conflict in nova/tests/test_quota.py
 - python3 exception handling

CONFLICT (content): Merge conflict in nova/tests/scheduler/test_rpcapi.py
 - update_service_capabilities() and test_select_hosts() removed

CONFLICT (content): Merge conflict in nova/tests/db/test_migrations.py
 - lots of tests removed

CONFLICT (content): Merge conflict in nova/tests/console/test_rpcapi.py
 - needed to add Havana testing infra

CONFLICT (content): Merge conflict in nova/tests/compute/test_compute_api.py
 - system_metadata arg to inst.system_metadata for notify_about_instance_usage

CONFLICT (content): Merge conflict in nova/tests/compute/test_compute.py
 - testtools_matchers added

CONFLICT (content): Merge conflict in nova/tests/cells/test_cells_rpcapi.py
 - get_vnc_console() version bumped to 3.2, can ignore this and go with original port
 - basestring vs six.string_types

CONFLICT (modify/delete): nova/tests/api/openstack/compute/plugins/v3/test_personalities.py deleted in HEAD and modified in Port to oslo.messaging. Version Port to oslo.messaging of nova/tests/api/openstack/compute/plugins/v3/test_personalities.py left in tree.
 - remove

CONFLICT (modify/delete): nova/tests/api/openstack/compute/plugins/v3/test_disk_config.py deleted in HEAD and modified in Port to oslo.messaging. Version Port to oslo.messaging of nova/tests/api/openstack/compute/plugins/v3/test_disk_config.py left in tree.
 - remove

CONFLICT (content): Merge conflict in nova/test.py
 - added format arg to log_fixture

CONFLICT (content): Merge conflict in nova/scheduler/utils.py
 - couple of nova.objects imports added

CONFLICT (content): Merge conflict in nova/scheduler/rpcapi.py
 - object serializer added

CONFLICT (content): Merge conflict in nova/scheduler/manager.py
 - new deprecation comment

CONFLICT (modify/delete): nova/openstack/common/rpc/impl_qpid.py deleted in Port to oslo.messaging and modified in HEAD. Version HEAD of nova/openstack/common/rpc/impl_qpid.py left in tree.
 - delete

CONFLICT (content): Merge conflict in nova/manager.py
 - SchedulerDependentManager and service capabilities stuff removed

CONFLICT (modify/delete): nova/db/sqlalchemy/migrate_repo/versions/200_add_transport_url_to_cell.py deleted in HEAD and modified in Port to oslo.messaging. Version Port to oslo.messaging of nova/db/sqlalchemy/migrate_repo/versions/200_add_transport_url_to_cell.py left in tree.
 - delete

CONFLICT (content): Merge conflict in nova/console/rpcapi.py
 - havana compat

CONFLICT (content): Merge conflict in nova/console/manager.py
 - bump version to 2.0

CONFLICT (content): Merge conflict in nova/conductor/manager.py
 - import six
 - bump version to 1.62

CONFLICT (content): Merge conflict in nova/compute/rpcapi.py
 - bump version to 3.0
 - version_cap infra for security group API

CONFLICT (content): Merge conflict in nova/compute/manager.py
 - remove old rpc imports
 - bump version to 3.4
 - add NotImplementedError to expected exceptions

CONFLICT (content): Merge conflict in nova/cmd/manage.py
 - import six

CONFLICT (content): Merge conflict in nova/cert/rpcapi.py
 - havana compat

CONFLICT (content): Merge conflict in nova/cert/manager.py
 - bump version to 2.0

CONFLICT (content): Merge conflict in nova/cells/manager.py
 - bump version to 1.25

CONFLICT (content): Merge conflict in nova/api/openstack/compute/plugins/v3/servers.py
 - old rpc removed, strutils added

CONFLICT (modify/delete): nova/api/openstack/compute/plugins/v3/coverage.py deleted in HEAD and modified in Port to oslo.messaging. Version Port to oslo.messaging of nova/api/openstack/compute/plugins/v3/coverage.py left in tree.
 - delete

CONFLICT (content): Merge conflict in nova/api/openstack/compute/plugins/v3/cells.py
 - import six

CONFLICT (modify/delete): nova/api/openstack/compute/contrib/coverage_ext.py deleted in HEAD and modified in Port to oslo.messaging. Version Port to oslo.messaging of nova/api/openstack/compute/contrib/coverage_ext.py left in tree.
 - delete

CONFLICT (content): Merge conflict in nova/api/openstack/compute/contrib/cells.py
 - import six

CONFLICT (content): Merge conflict in etc/nova/nova.conf.sample
 - revert and autogenerate

nova/compute/resoure_tracker.py:
nova/tests/compute/test_resource_tracker.py:
 - was using the old notifier API
 - test case needed some mock wrangling

nova/tests/compute/test_compute.py:
 - lingering use of rpc_common.ClientException

nova/compute/manager.py:
 - lingering use of rpc_common.client_exceptions

nova/compute/rpcapi.py:
nova/cert/rpcapi.py:
nova/console/rpcapi.py:
  - s/self.can_send_version/self.client.can_send_version/

nova/compute/cells_api.py:
  - implement can_send_version() in RPCClientCellsProxy

nova/tests/console/test_rpcapi.py:
nova/tests/consoleauth/test_rpcapi.py:
nova/tests/cert/test_rpcapi.py:
nova/tests/compute/test_rpcapi.py:
  - port to mock to avoid can_send_version() weirdness with mox
  - update for new can_send_version usage