fix --excluded of meter-label-rule-create is not working

rule['excluded'] is boolean type, should not be compared with 'true'

Closes-Bug: #1248002
Change-Id: Ie78c307ede1f7124c58354825a411474ff6c1234
(cherry picked from commit 504f496d6b4fd6234c3e65ba636ee12b004fae1f)
[ML2] l2-pop MD handle multi create/delete ports

If more than one port is added or removed simultaneously, port db entry
have status BUILD or DOWN and pass to ACTIVE when agent have finish to
configured it.
l2-pop mechanism driver use events port pass to ACTIVE or DOWN to send
fdb entries. In case of port is the first or the last network port on
an agent, the flooding entry need to be add or removed.

This patch fix the method to determine how many ports are active on a
agent by adding filter on status port to be ACTIVE.

Closes-bug: #1263881
(cherry picked from commit 7e91362dbb974df5ee44d346e1d0971479510d4b)

Change-Id: Id6d7273376cbb7c31aa058f80eee9dab12ffa900
Remove the warning for Scheduling Network

when a new port is created, the schedule_network in agentschedulers_db is called.
Since this network may already be hosted, it will directly return None in dhcp_agent_scheduler,
which cause the agentschedulers_db.schedule_network log a warning message.

This is really annoying and making users confused.
And, real warnings are already addressed in the real scheduler function.
which is neutron.scheduler.dhcp_agent_scheduler.ChanceScheduler.schedule by default.

Cherry-picked from 3ef877fc5a669659c2fa4bb2fc416d4a473c6ac5 in master.

Change-Id: I11bdbe47c2cc0fc45fb143970fb6762678bc27e5
Closes-Bug: #1192786
Update help message of flag 'enable_isolated_metadata'

Thanks to the commit c73b54e50b62c489f04432bdbc5bee678b18226e,
the way of DHCP agent determines how a subnet is isolated evolves.
But the flag help message wasn't updtated accordingly to this evolution.

Depends on https://review.openstack.org/#/c/77118/ getting merged.

Change-Id: If07d8e0802524f9babdee0c8cc07d40cb0803afb
Closes-bug: #1269722
(cherry-picked from 6dd1a370fe2ece809c06202c04a7d230a74fa91a on master)
Merge "[ML2] l2-pop MD handle multi create/delete ports" into stable/havana
Merge "fix --excluded of meter-label-rule-create is not working" into stable/havana
Report proper error message in PLUMgrid Plugin

Change-Id: Ifc1bb55f6b025bba77cf9858ed392dbf170075a7
Closes-Bug: #1268460
Signed-off-by: Fawad Khaliq <fawad@plumgrid.com>
(cherry picked from commit 5fae0fae2164f4fab64e3eff01c9c644d861946a)
Adds id in update_floatingip API in PLUMgrid plugin driver

The id parameter is missing in the update_floatingip API, this patch
adds it.

Change-Id: I7407fe34628f8ef03a946a11fea9dad8b0f6c256
Closes-Bug: #1257119
(cherry picked from commit b6e23caddf05457b2337ac03d33b066a36aad154)
Merge "Report proper error message in PLUMgrid Plugin" into stable/havana
Merge "Remove the warning for Scheduling Network" into stable/havana
Updated neutronclient dependency

This is needed by: 15a912b1ca3c24ba8851b8b77d6de8027e120d78

Change-Id: If0eab1b5dd102cc5ceb7720a8465ee47a708839d
Closes-Bug: #1280941
Use a more accurate max_delay for reconnects

In an HA deployment, a 60 seconds delay between reconnects can be quite
problematic. This patch changes the delay calculation by setting the max
delay to 5s and by changing the way it is increased.

Unfortunately, this is one of the places where both our main drivers are
not consistent. Rabbit's driver uses configuration parameters for this
whereas qpid's driver has never had one. However, I would prefer not
adding configuration paremeters to qpid's driver for the following
reasons:

    1. Most of OpenStack services depend on the messaging layer, hence
    they need it to be available. A 5s delay seems to be reasonable and
    I could argue the need of tune it further. Although so frequent
    reconnects can add load to the network, that wouldn't be the main
    issue if one of the brokers go down.
    2. We're trying to move away from configuration options towards using
    transport URL. This path is still not clear and I would
    prefer avoiding adding new options until we clear it out.

(the patch is synced from oslo-incubator)

Change-Id: I537015f452eb770acba41fdedfe221628f52a920
Closes-bug: #1281148
NSX: Fix possible deadlock in sync code

This patch removes the call to nsx from within the db transcation
which can cause deadlock if another request comes in during this time.

Closes-bug: #1278991
Change-Id: If16b53a77997bccfdff2554dead26f42e23eaec9
(cherry picked from commit d59d5a1c72c2324b857225680f5578d381a2ec73)
NSX: Sync do not pass around model object

The NSX sync backend previously passed around a sqlalchemy model object
around which was nice because we did not need to query the database an
additional time to update the status of an object.

Unfortunately, this was add done within a db transaction which included a
call to NSX which could cause deadlock this needed to be removed. Now a
dict is passed around instead and proper transaction handling
is used when updating objects.

Closes-bug: #1281772

Conflicts:
	neutron/plugins/nicira/common/sync.py

Change-Id: Id50abd8f2143b127d1ca81c360c1c6d400e1d74f
(cherry picked from commit 084b7f62280241a9037b6f9e592c466135e5fec1)
Merge "Update help message of flag 'enable_isolated_metadata'" into stable/havana
Merge "NSX: Fix possible deadlock in sync code" into stable/havana
Merge "NSX: Sync do not pass around model object" into stable/havana
Merge "Updated neutronclient dependency" into stable/havana
Adds Hyper-V utils methods

Adds Hyper-V utils methods which will be used in the next commit.

(cherry picked from commit c823016d31b36c10cb6faafcce68a1b98f4dc345)

Partial-Bug: #1263766
Change-Id: I7556001557cd013c10b7f883dbf371afa8d09626
Fixes Hyper-V port metrics enabling after service restart

(cherry picked from commit 492190aae01b6587be9e4280a819e2d5a1fdbf97)

Closes-Bug: #1263766
Change-Id: I48fb5389b6049641ca2649990e81e94e4c45ef7f