Vmware: Set correct nullable for lsn_id, nsx_port_id

Corrected the following models according to database
content:
- NOT NULL for LsnPort lsn_id;
- NOT NULL for NeutronNsxPortMapping nsx_port_id;

Partial-Bug: #1296282

Change-Id: Ia67fcc68eeceb27d9274adb652ab45b32152f01c
LBaaS: Set correct nullable parameter for agent_id

Corrected the following model according to database
content:
 - NOT NULL for PoolLoadbalancerAgentBinding agent_id;

Partial-bug: #1296282

Change-Id: I1f11ec2e8f4c16f58dd8d4e6429e46eaedaec945
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.

Change-Id: Ic0f0d816cca06a3b03fdd9b58ee7599ddf65473e
Closes-Bug: 1290646
Fix protocol value for SG IPV6 RA rule

The ingress SG rule for RA has a wrong value for protocol
field.

Change-Id: I4d3bca4b758540cf857eb13d36ee18f8ebc28272
Closes-Bug: #1312392
NSX: fix API payloads for dhcp/metadata setup

NSX 4.2 GA has tweaked the way dhcp and metadata
ports are configured. This patch takes care of
that.

Closes-bug: #1312822

Change-Id: I4e8496bf721c0f35df4228ec9c6f8066275e8c7a
Wrong key router.interface reported by ceilometer

Ceilometer with MongoDB doesn't accept the key with dot.

The dot in 'router.interface' should be replaced with '_',
which is also the standard implementation of other keys in neutron.

Change-Id: If7fcf7658db9ee2d7d1248bb0b016b4389c32c77
Closes-Bug: #1310460
Removed signing_dir from neutron.conf

The default value from keystone middleware ($TMPDIR) is good enough,
so stick to it.

Closes-Bug: 1313780
Change-Id: Ideb393f9010f4f1706392ccdfdd5fa7307bda070
Allow ML2 plugin test cases to be run independently

Some test cases in neutron.tests.unit.ml2.test_ml2_plugin override the
network_vlan_ranges option in the ml2_type_vlan config group. However,
the test module does not import the ML2 type driver module where this
config group's options are registered. When unit tests are run by
tox/testr the module is imported during test discovery. Running the
tests independently via nose or testtools requires the option to be
explicitly imported.

Change-Id: I355a2d1212992eafed44f6d843c0fc9deb665df7
Closes-bug: #1287792
Synced jsonutils from oslo-incubator

The sync includes change that drastically enhances performance on Python
2.6 with fresh simplejson library installed.

The latest commit in oslo-incubator:
- 732bdb6297eb9de81667f7713ebcb1ccc2ee45a7

Change-Id: Ib3dc0b713ed90396919feba018772243b3b9c90f
Closes-Bug: 1314129
Updated from global requirements

Change-Id: I6090b1bde89b25eaa1aea94024b7f4225375e65e
Merge "Updated from global requirements"
Merge "Fix protocol value for SG IPV6 RA rule"
Imported Translations from Transifex

Change-Id: I7ac7de8fb1cea473df6059e9443df1418c800521
OVS and OF Agents: Create updated_ports attribute before setup_rpc

setup_rpc spawns rpc-consuming thread that can access
self.updated_ports before it is created in the constructor

Change-Id: Icc447c3bb7099125aae30e2430a6ad98ba00f6f9
Closes-Bug: #1314472
Merge "Wrong key router.interface reported by ceilometer"
Cisco VPN device driver - support IPSec connection updates

Provides support for IPSec connection updates and state changes. To do
this, the configuration of the connection is maintained, when the
connection is created. This is checked against the current settings, at
sync time, to determine whether a configuration change (as opposed to a
state change) has occurred.

If there is a change to the configuration detected, then the simple
approach is taken of deleting and then re-creating the connection, with
the new settings.

In addition, if the admin state of the connection changes, the tunnel
will be taken admin down/up, as needed. Admin down will occur if the
IPSec connection or the associated VPN service is set to admin down.
Admin up will occur, if both the IPSec connection and the VPN service
are in admin up state.

Added REST client method to allow changing the IPSec connection tunnel
to admin up/down (effectively doing a no-shut/shut on the tunnel I/F),
based on the above mentioned state.

Modified UTs for the support of IPSec connection update requests (used to
throw an "unsupported" exception), and to check that the configuration
and state changing are processed correctly.

Updated so that tunnel_ip is set in device driver, rather than hard
coding, and then overriding in REST client. Since device driver has the
same info, this will fit into future plans to obtain the info from
router, vs reading an .ini file. Revised UTs as well.

Change-Id: I184942d7f2f282c867ba020f62cd48ec53315d3e
Closes-Bug: 1303830
Merge "Synced jsonutils from oslo-incubator"
Merge "Imported Translations from Transifex"
Don't print duplicate messages on SystemExit

Don't log the error using LOG.error or LOG.exception and then
passing the same string to SystemExit since this will result in the
error being logged twice. Instead log the error and raise SystemExit(1).

Change-Id: I88b6632e6596a36a7168155dd4219e7d55078621
tests/unit: refactor reading neutron.conf.test

neutron.conf.test includes rpc_backend whose value is stashed.
Thus it is required to reset when tearing down, otherwise the stale status
will be used by succeeding tests causing random error.

This patch refactors reading neutron.conf.test and resets the status of
rpc_backend properly.

Closes-Bug: #1281481
Closes-Bug: #1284549
Change-Id: I0fa5945b6adbb9945d353028ec88d00ccbf4e31a