Fixes Hyper-V agent security group ICMP rules

Converts ICMP protocol to the equivalent protocol number.
Adds default ICMP reject rules.
Adds default ANY protocol rules if the rule does not
contain any protocol.

Closes-Bug: #1299159
Change-Id: Iff51a58fdb532eda0fe7a63abf96004ee74bb073
(cherry picked from commit f56972193be903c67cd54c57bcc2becf6222aced)
Fixes Hyper-V agent security groups disabling

Adds a check if the security groups have been disabled and removes
the switch port's ACLs accordingly.

Change-Id: I20d716a3f182b8ea62da6b436b150aa9dafdb1c5
Closes-Bug: #1299156
(cherry picked from commit 6d49834976bc08d2b8f7939bc2a217f5cc81db47)
ofa_neutron_agent: Fix _phys_br_block_untranslated_traffic

Install the flow to the correct bridge.

Closes-Bug: 1301142
Change-Id: I2aa7ffd6bb297837a39cdd00794af100bf9ab407
(cherry picked from commit 7f5e7c945821b75bd7321bfd0b0c63f2888ac72e)
OFA agent: use hexadecimal IP address in tunnel port name

The remote IP address is used to form the tunnel port name
With some OVS/Linux combinations there is a 15 character limit
on port names, so a name like 'gre-192.168.10.10' does not work.
This fix uses the shorter hexadecimal representation of
the IP address instead.
This problem was reported and fixed for OVS agent.

Closes-Bug: 1294474

Conflicts:
	neutron/plugins/ofagent/agent/ofa_neutron_agent.py

Change-Id: Ieab1eb8a5c430f69aff61a317cc28f23ba95ad2d
(cherry picked from commit c506ebf317e64766369c0bfa97b6af182656ac4c)
ofagent: Add a missing push_vlan action

Fix the flow for _provision_local_vlan_inbound_for_tunnel
to push-vlan explicitly.  While the old code happened to
work with older versions of OVS, it was spec-wise incorrect because
it failed to meet the prerequisite of the following set-field.
The latest version of OVS correctly rejects such a flow.

Closes-Bug: #1308927
Change-Id: I66221eec0cb4083d178d7d5651360ee1874e3d1b
(cherry picked from commit 9f673c2482528bdde15776c52928dbaceecdf811)
Segregate the VSM calls from database calls in N1kv plugin

Rearrange the code in such a way that the calls to the VSM are
outside the database session. This avoids DB locks on n1kv tables.

Conflicts:
	neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py

Change-Id: Ic0f0d816cca06a3b03fdd9b58ee7599ddf65473e
Closes-Bug: 1290646
(cherry picked from commit 1e210c7cc9d3d8dd6b3a72112dd8395cad4dc3a9)
Big Switch: Catch exceptions in watchdog thread

Catch and log exceptions in the watchdog greenthread to prevent
them from stopping the periodic consistency checks.

Closes-Bug: #1330135
Change-Id: I6834c0fee0429bb72b8c61307be7bdca77f6de9b
(cherry picked from commit f89a6bd30b6f99bc39f266ae8d3880380379f8b9)
Added missing core_plugins symbolic names

Some plugins miss short symbolic name in setup.cfg, specifically Nuage
and Metaplugin.

Conflicts:
	setup.cfg

Change-Id: I0198ae98654bbdddf8f2ba8dd3b80d0d447d6341
Closes-Bug: 1324487
(cherry picked from commit 664bdcdc7d714bcdfe503db8f59c6a3f97668df2)
Big Switch: Add missing data to topology sync

Adds data to the topology sync function that was
missing in the case where it is called from the
ML2 driver.

Closes-Bug: #1328222
Change-Id: I1cc3b0430f63f62c881f28139d1e5ebf22766357
(cherry picked from commit 2d9488be71244cd7fcee624764b2f6c0cc5fe3a1)
remove token from notifier middleware

oslo-incubator sync to address the security bug
in middleware (as below).

notifier middleware is capturing token and sending it to MQ. this
is not advisable so we should filter it out.

Change-Id: Ia1bfa1bd24989681db1d2f385defc12e69a01f8d
Closes-Bug: #1321080
ovs-agent: Ensure integration bridge is created

ovs-agent will fail to launch if integration bridge(br-int by default) is not
existed. To fix this, the agent should check and create the bridge if necessary
during launching.

Cherry-picked from https://review.openstack.org/#/c/98755/

Closes-Bug: 1328076
Change-Id: Iaa6c4d766ca086deb28c8ef7310dbfdcef2c105f
Merge "Segregate the VSM calls from database calls in N1kv plugin" into stable/icehouse
Merge "remove token from notifier middleware" into stable/icehouse
Merge "ovs-agent: Ensure integration bridge is created" into stable/icehouse
Merge "Big Switch: Catch exceptions in watchdog thread" into stable/icehouse
Merge "OFA agent: use hexadecimal IP address in tunnel port name" into stable/icehouse
Merge "Big Switch: Add missing data to topology sync" into stable/icehouse
Big Switch: Remove unnecessary initialization code

Removes a server_timeout parameter that was never set by anything
in the Big Switch plugin and the ML2 driver.

Also eliminates an __init__ method that didn't do anything except
incorrectly log an unset server pool warning before the inheriting
class setup the server pool.

Closes-Bug: #1331249
Change-Id: I77dd22295305b96d4702f1ea0e319dc5f82c71a8
(cherry picked from commit 24a19bfd362996cd9833a167d6eb86fdcf743b75)
Add missing keyword raise to get_profile_binding function

Improve corresponding unit tests.

Change-Id: I8f71ee7aa8fcafbf3ef6e3f9d4f0b89c874af73b
Closes-Bug: #1329426
(cherry picked from commit 13fe102fadf8d25b0927ee172b0fb3f681c56bf4)
Merge "Added missing core_plugins symbolic names" into stable/icehouse