Merge "Update send_arp_for_ha default in l3_agent.ini"
Merge "change NetworkVxlanPortRangeError to base NeutronException"
Remove uneeded variable AGENT_NAME

Fixes bug: 1243464

Change-Id: I833dd64e98c679c050aa958576c7726bfa15cc8e
Support uncompressed ipv6 address and abbreviated ipv4 address

Now neutron supports zero-compressed ipv6 address like
'2001:db8::10:10:10:0/120' and unabbreviated ipv4 address
like '10.0.0.0/24'.
This path will make neutron also support uncompressed ipv6
address and abbreviated ipv4 address. for example:
1, uncompressed ipv6 address like 'fe80:0:0:0:0:0:0:0/128'
2, ipv6 address with multiple consecutive zero like
   '2001:0db8:0:0:1::1/128' or '2001::0:1:0:0:1100/120'
3, abbreviated ipv4 address like '10/24'

Change-Id: I755e38ea11c139e15488ec60e7d5682a244ab114
Closes-Bug: #1240790
Utilizes assertIsNone and assertIsNotNone

Using assertEqual/assertNotEqual to test if an element
is or is not None is too python2.4.
Our unit testing framework supports assertIsNone and assertIsNotNone
which were created for these types of tests.

Partial-bug: #1230028

Change-Id: Ie0bddae642f7973ee8b0e00164415f8d87de387e
Fix required enum's name in migration

Enums must contain name parameter for PostgreSQL and need to be
deleted after dropping table.

Closes-Bug: #1243652
Closes-Bug: #1243213

Change-Id: I01d18ff25572bbe9e6a8b8c6ae27f250ab154734
Handle 405 error codes correctly in NVP plugin

When NVP returns a 405 error code no exception is
raised, causing the plugin to assume that everything
went well when it didn't.

Fixes bug #1243411

Change-Id: If70db05b8c6950bfa88a36c4f0c20ee80419d31d
fix nvp version validation for distributed router creation

Fix typo on major version. This was not caught during unit tests
so adds a few to ensure this does not regress.

Fix bug #1243862

Change-Id: Ie136aaa504939d8ac77dda07e3f955aed8c233f9
Fix argument mismatch failure for neutron-check-nvp-config

Use sys.argv directly.

Fix bug #1243888

Change-Id: I9cb6ca841d004baf72dd68e44be673c361c2ed05
Merge "Spawn arping in thread to speed-up floating IP"
fixes test_kill_pids_in_file conflicts

Fixes Bug: #1231246
Change-Id: Ibedd59d6570cd8d5020e99125c6808d5d2170851
Fix TypeError: <MagicMock name='LinuxBridgeManager().local_ip'

This patch fixes an error that does not result in a test failure but
causes the following error to be logged in the test logs:

TypeError: <MagicMock name='LinuxBridgeManager().local_ip' id='666599248'>
is not JSON serializable

Related-Bug: #1234857

Change-Id: I65cdd997745d8b760031f8f32e3c10682ad2288e
change assertEquals to assertEqual

According to http://docs.python.org/2/library/unittest.html
assertEquals is a deprecated alias of assertEqual.

Change-Id: I4030e9f9b184af60eb9253b3a1d7e1cc929d502d
Imported Translations from Transifex

Change-Id: Iacabec05e369340634cd36231d4e2ced64e0543c
LBaaS: when returning VIP include session_persistence even if None

Closes-Bug: #1231915
Change-Id: I3dc5e17118995fb49dd381d08c9d92cb60b80abb
Removing workflows from the Radware driver code

Removing workflows handling from the driver code.
Removing workflow related files
Modifying tests to support new behavior

Change-Id: Icbb6106db07e5b33c37192aa53d088e67bd4a795
Closes-bug: #1239288
Updated from global requirements

Change-Id: Ifbcffab245f7dee50f5a84489011e220a3f8fea8
Merge "Imported Translations from Transifex"
NVP: Correct NVP router port mac to match neutron

Previously when router ports were created the mac_address from neutron
was not passed to nvp so nvp generated it's own mac_address for the port.
This patch fixes this by passing the mac_address on the port to nvp.

Fixes bug: 1244481

Change-Id: I0d0e068923497a13915749f3781d54194cfcfe89
Merge "Fix TypeError: <MagicMock name='LinuxBridgeManager().local_ip'"