Qpid: explicitly name subscription queue

This ensures that on reconnect the same queue is used rather than
leaving it abandoned but still bound with the same routing key that will
be used with the new queue.

Note: the fix is not relevant for Juno since Neutron uses oslo.messaging
since then which already includes the fix.

Change-Id: Ib76371a3b649688df395d7bf07f813a837b2313a
Closes-Bug: 1318742
Add unit tests covering single operations to ODL

This commit adds the remaining test cases (create and update
operations) to fully cover sync_single_resource. It also defines the
filter_* methods as static or class methods and removes their duplicate
arguments.

Conflicts:
        neutron/plugins/ml2/drivers/mechanism_odl.py

Closes-Bug: #1325184
Change-Id: I6b6153ea577bd685576690559b1c389490ee525d
(cherry picked from commit 903e2a8cd1dd9169048d1ad9dd8a566b2ae52395)
Cisco: update_port should only invoke n1kv and not nexus plugin

Update port method should not invoke the nexus plugin when it is
not configured with n1kv plugin. This patch adds a condition to the
update_port method making sure that nexus plugin is invoked only
when it is configured in cisco_plugins.ini file. This bug is only
targeted for the stable/icehouse release since the nexus monolithic
plugin code has been removed from Juno release onwards.

Change-Id: I67f023e8610975d9636124e9f82336b5ab407c16
Closes-bug: #1387846
Delete disassociated floating ips on external network deletion

Also remove redundant check for network in use in bigswitch plugin

Closes-Bug: #1238439
Closes-Bug: #1259144
(cherry picked from commit 1763c80711993c55f4f13afe56f449b1dd6d3d3a)

Change-Id: I7586f43c2e99be9df491c68bf1e8658994ffd263
Stop ignoring 400 errors returned by ODL

This commit stops ignoring 400 (Bad Request) HTTP codes returned by ODL
in create and update operations. It also modifies sendjson() because it
doesn't ignore any HTTP error code now.

Closes-Bug: #1369239
Change-Id: Id0db2c0c1d8fddfbd16b3ce9476a2358e2ef1e49
(cherry picked from commit f1507d080d9840e4cb6c1d5cfe5a4b6c1443bd8f)
Convert all incoming protocol numbers to string

PostgreSQL is more sensitive for types than MySQL when it selects
something from columns in database. So it fails when it tries to
select from string field comparing with integer value.

Added unit test to verify conversion of protocol numbers to
strings.

Closes-bug:#1381379

(cherry picked from commit bc34f26302faea116be7e61051c32f8787530836)

Conflicts:
	neutron/tests/unit/test_extension_security_group.py

Change-Id: I0a29595403a07c66888871088d5549705a097f68
(cherry picked from commit c00b4b31276f9ae21fa0a7a213391277bda4cfa7)
Updated from global requirements

Change-Id: Icab7fc1df43cbaee7e73066d96eff11e9122103a
Merge "Delete disassociated floating ips on external network deletion" into stable/icehouse
Merge "Updated from global requirements" into stable/icehouse
Merge "Add unit tests covering single operations to ODL" into stable/icehouse
Merge "Stop ignoring 400 errors returned by ODL" into stable/icehouse
Merge "Cisco: update_port should only invoke n1kv and not nexus plugin" into stable/icehouse
Merge "Qpid: explicitly name subscription queue" into stable/icehouse