Commit Graph

3561 Commits

Author SHA1 Message Date
Jenkins
494c97a413 Merge "Support for NVP advanced service router" 2013-09-11 17:52:32 +00:00
Jenkins
ddc780dc30 Merge "Ensure pid file is removed when metadata ns daemon receives SIGTERM" 2013-09-11 17:45:19 +00:00
Bob Melander
715b16aca7 Adds support for L3 routing/NAT as a service plugin
- Adds L3 routing/NAT service plugin
- Removes L3 routing/NAT from ML2 plugin
- Moves "router:external" attribute to new extension "External-net"
- Introduces separate RPC topic for L3 callbacks from L3 agent

Implements: blueprint quantum-l3-routing-plugin

Change-Id: Id9af10c2910f9a1730b163203a68d101ffc3b282
2013-09-11 12:12:10 +02:00
Kaiwei Fan
f43eb49f56 Support for NVP advanced service router
When creating an LR:
    - deploy an Edge asynchronously
    - create a L2 switch for connecting LR and Edge
    - attach a router port to the L2 switch.
    - assign ip address 169.254.2.1/28 and nexthop 169.254.2.3 to LR
When set external gateway:
    - configure Edge interface and default gateway
    - Add static routes to Edge for all logic networks attached to LR via nexthop 169.254.2.1
    - configure SNAT rules for all logic networks attached to LR
When add router interface:
    - Add static route/SNAT rule for the network attached to LR
When associate floating IP address:
    - configure DNAT rule for the floating ip and the port

Tests being done:
    - Verified Edge is deployed asynchronously and LR is attached to the internal created L2 switch
    - Manually attach Edge's vNic to the L2 switch and Edge is able to ping 169.254.2.1
    - Verified router-delete deletes Edge asynchronously and remove the internal L2 switch
    - Verified SNAT/DNAT/static-routes rules are configured on Edge in correct order
    - Verified external vnic ip address/netmask and default gateway is configured

Implements: blueprint nvp-service-router
Change-Id: If9eff53df4d65cf4e318dedbfaafc742f6c6ab7f
2013-09-11 00:58:57 -07:00
OpenStack Jenkins
39ef7594bd Merge "Imported Translations from Transifex" 2013-09-11 07:38:53 +00:00
Jenkins
f5108594c2 Merge "Register an extend_dict function for ext_gw_mode extension" 2013-09-11 07:16:50 +00:00
OpenStack Jenkins
cdbce39d79 Imported Translations from Transifex
Change-Id: I8de01b47a78ae301d9760ee8ab0e596e967e333f
2013-09-11 06:09:42 +00:00
Salvatore Orlando
1dabc0629e Register an extend_dict function for ext_gw_mode extension
Bug 1223585wq

Use dict extension methods instead of overriding make_router_dict in
order to make this extension consistent with all the others.

Change-Id: I94fa7e70e5a869963ec4dfa9de85c8d922976843
2013-09-10 15:38:16 -07:00
Justin Hammond
e541ca285d Adds help text to brocade configuration options
Help text was added to the configuration options defined in the brocade neutron
plugin. This help text should assist users of the brocade plugin. The OSTYPE
configuration option was not used in the plugin and was labeled as such so a
user of the plugin would not worry about the meaning of it.

The example etc file /etc/neutron/plugins/brocade/brocade.ini has been updated
to share the same help values where applicable.

Fixes-Bug: #1157511

Change-Id: Ie068396e77902037a7a0b5334d4dfb0dcdd3575e
2013-09-10 14:58:52 -07:00
OpenStack Jenkins
72c969f332 Merge "Imported Translations from Transifex" 2013-09-10 16:16:18 +00:00
Mark McClain
98e16a06e4 add missing comma to supported alias string list
Fixes bug: 1222949

Change-Id: Iac7f3b7605149e706e2ea8a30700dccd09f3c57e
2013-09-10 08:38:50 -04:00
Darragh O'Reilly
4535505fc1 Ensure pid file is removed when metadata ns daemon receives SIGTERM
These files from the metadata namespace proxy are not being removed
because delete_pid() is registered with atexit. This means it only runs
when a process exits normally and won't run when a process receives a
signal.

This patch registers a signal handler for SIGTERM that calls exit()
to make the process exit normally so delete_pid() gets called.

Fixes bug: 1223250

Change-Id: I6309802e2109359560ccc084559ec8e4d310cce2
2013-09-10 09:06:28 +00:00
OpenStack Jenkins
8de863ddfd Imported Translations from Transifex
Change-Id: Ib94bfe915a60c9c1a1d2375b9a15c666f065d865
2013-09-10 06:09:56 +00:00
armando-migliaccio
5281b806d2 Avoid KeyError 'distributed' exception when using NVP <3.x
This patch fixes an issue found when creating routers with
NVP plugin and NVP platform 2.2

Fixes bug 1220931

Change-Id: Ia7b358b59e48a723c07efec015bb650accaa3322
2013-09-09 14:54:32 -07:00
Jenkins
d7855621b1 Merge "Make neutron.common.log.log print module path" 2013-09-09 16:33:45 +00:00
OpenStack Jenkins
2a2125a4a6 Merge "Imported Translations from Transifex" 2013-09-09 15:31:16 +00:00
Jenkins
56aca213a6 Merge "Enhance unittest for hyperv_neutron_agent" 2013-09-09 15:24:41 +00:00
Jenkins
17336c6540 Merge "Fix message i18n error" 2013-09-09 15:03:30 +00:00
Jenkins
0321107cc5 Merge "LBaaS: Fix healthmonitor disassociation for non-admin" 2013-09-09 12:46:04 +00:00
Jenkins
c896e34bd3 Merge "Move declaration of int_br_device_count earlier" 2013-09-09 09:03:01 +00:00
Eugene Nikanorov
9f60611c90 LBaaS: Fix healthmonitor disassociation for non-admin
Due to specifics of policy engine, checked object should have
tenant_id to be checked by rule admin_or_owner.
In 'disassociate' operation neutron API layer works with
PoolHealthMonitorAssociation which doesn't have tenant_id field.
Need to add it to resulting dict returned by get_pool_health_monitor.

Change-Id: I6c58558b09ff34dedd7da30866275de44d3ba993
Closes-bug: 1220668
2013-09-09 11:22:46 +04:00
OpenStack Jenkins
860e91966b Imported Translations from Transifex
Change-Id: I3f069fcb0ff5645581152ca33d12ed802d0779e5
2013-09-09 06:10:05 +00:00
ZhiQiang Fan
9842dcb34c Fix message i18n error
Partial-Bug: #1217100

Using tools/check_i18n.py to scan source directory, and fix most of
the errors.

- Message internationalization
- First letter must be capital
- Using comma instead of percent in LOG.xxx

Note: all extension's description are not touched in this patch,
can be fixed after discussing.
Note: all nicira/check_nvp_config.py print messages are not fixed.

Change-Id: I79ef06fd42f6780beb5019c592662536c2a51864
2013-09-08 15:58:12 +08:00
Hui HX Xiang
db3b1c01b5 Enhance unittest for hyperv_neutron_agent
Change-Id: Idc726ba668eba56a64dc498b49ec0e5e397590b5
2013-09-07 17:18:43 -07:00
Jenkins
57ce39fa66 Merge "Enclose command args in with_venv.sh" 2013-09-07 16:58:56 +00:00
OpenStack Jenkins
9707c73a9b Merge "Imported Translations from Transifex" 2013-09-07 16:58:03 +00:00
Jenkins
45beae8cc0 Merge "Fix IF checks on spawned green thread instance" 2013-09-07 16:57:54 +00:00
OpenStack Jenkins
f7c55db888 Imported Translations from Transifex
Change-Id: I4602704b4a4f1be5a49f1431eebd58072dfb7704
2013-09-07 06:10:31 +00:00
Jenkins
0f81818165 Merge "Mock midonetclient in test_midonet_lib" 2013-09-06 23:37:45 +00:00
Kaiwei Fan
fc0e7cd5ab Fix IF checks on spawned green thread instance
Initially the symptom looks like race condition between two threads when
stopping the task manager. After further analysis/troubleshooting, it
turns out that two threads are spawned if a task manager is stopped and
started again, causing unexpected errors.

The IF check on the spawned thread sometimes return True sometime return False
if not compared against None explicitly. This makes start() method
think no thread has been started or stop() method think no thread is started.
Change the check to compare against None.

Also fixed a problem in unit-test where a thread may never terminated when
a stop call is invoked during db access.

Closes-Bug: 1221486
Change-Id: I0d67bfe8fef7a390f0d6bc0f5a42835f86a9fb27
2013-09-06 15:24:42 -07:00
armando-migliaccio
e82f0eb5df Prevents 400 NVP errors caused by a None display_name
The API forbids a resource name to be None, but the
Model does not. Such errors may  be induced by
programming directly against the plugin interface. With
this fix we avoid raising 400 faults which may be introduced
by involuntary programming errors.

Fixes bug 1221896

Change-Id: Ic1201c5af5691f2bed38753453f73c229858b10f
2013-09-06 13:59:18 -07:00
Akihiro MOTOKI
155cb48bca Make neutron.common.log.log print module path
Closes-Bug: #1221663

neutron.common.log.log is useful for logging arguments of a method.
It outputs class name and method name, but module path is not output.
A module path is useful to search the log message.

Change-Id: Ic2903da750cc13980d5cdee153bb079f7d4ee122
2013-09-07 02:10:57 +09:00
Jenkins
e26639b190 Merge "Replace assertEquals with assertEqual" 2013-09-06 14:49:52 +00:00
Rich Curran
5bae5828d3 Load ML2 mech drivers as listed in ml2_conf.ini
stevedore requires an additional parameter to be used (name_order=True) to
sort the loaded extensions to match the order used in the parameter "names".

bug 1221490

Change-Id: I614716c45d91cdf152650fba5ec8ced1e9c5aad4
2013-09-06 09:26:08 -04:00
Rossella Sblendido
fe92e1efbf Mock midonetclient in test_midonet_lib
Change-Id: Idb4de82c193b2f2589131b06bad04bc858499a21
Closes-bug: #1221674
2013-09-06 10:42:31 +00:00
Zhongyue Luo
902dc88b4c Replace assertEquals with assertEqual
The method assertEquals has been deprecated since python 2.7.
http://docs.python.org/2/library/unittest.html#deprecated-aliases

Also in Python 3, a deprecated warning is raised when using assertEquals
therefore we should use assertEqual instead.

Fixes bug #1221601

Change-Id: Id502cfbc210c6c3fe0a256d5350e159ffa220141
2013-09-06 16:19:07 +08:00
OpenStack Jenkins
394741cb90 Imported Translations from Transifex
Change-Id: I874308f83a54defeb77336acc1c0318172db1bb6
2013-09-06 06:09:44 +00:00
Jenkins
1a25274e7a Merge "vArmour gateway agent and FWaaS driver" 2013-09-06 00:34:03 +00:00
Jenkins
ee023ba698 Merge "Allow default network and policy profiles" 2013-09-05 22:26:49 +00:00
Jenkins
dfe371978c Merge "Install metering_agent.ini and vpn_agent.ini" 2013-09-05 22:18:37 +00:00
Jenkins
68139207eb Merge "LBaaS: make haproxy stats parsing more safe" 2013-09-05 22:12:48 +00:00
Sascha Peilicke
c25d740262 Install metering_agent.ini and vpn_agent.ini
Fixes Bug: 1221451
Change-Id: I83c4e4e0cfd6605930acfcc4f69ea9ece35abc24
2013-09-05 17:41:55 -04:00
Jenkins
0c1f9681dc Merge "fix conversion type missing" 2013-09-05 20:30:23 +00:00
Jenkins
7f78814383 Merge "Fix NVP plugin to send notifications for gateway-less subnets" 2013-09-05 20:25:05 +00:00
Abhishek Raut
dc48ac1a9c Allow default network and policy profiles
Allow for default network/policy profile to be used if
no network/policy profile is specified during network/port creation
in the Cisco N1KV plugin.

Change-Id: I6120abb5abb9a869eb7310453cf27dd8f72bfd1d
Closes-Bug: #1218588
2013-09-05 12:36:10 -07:00
Kun Huang
ee26de1ed2 fix conversion type missing
Conversion type is missing in some places which would cause some
unexcepted error. By using 'grep -rn "%(\w\+)\W"', we could find
all cases of '%(variable_a)' and fix them.

Change-Id: I05cbaac73976c70be8428bf5a2d0017ea7059cb3
Closes-Bug: #1221036
2013-09-06 02:16:13 +08:00
Jenkins
b15c0b3c95 Merge "Add sub-type field to VXLAN network profiles for Cisco N1KV plugin" 2013-09-05 16:13:17 +00:00
Jenkins
38f17e1e03 Merge "Implement Allowed Address Pairs" 2013-09-05 16:13:07 +00:00
Jenkins
9206e150a3 Merge "Use admin context to retrieve metadata ports in NVP plugin" 2013-09-05 15:31:20 +00:00
Abhishek Raut
50c9199d6a Add sub-type field to VXLAN network profiles for Cisco N1KV plugin
Rename VXLAN type of network profiles to Overlay network profiles.
Add a new sub type column to Overlay network profiles. Support
enhanced VXLAN and native VXLAN as Overlay sub types. Allow plugin to
be flexible to support newer sub types.

Change-Id: I3899b01f316902d1139e47b153a9db7ecb3ff982
Implements: blueprint cisco-plugin-n1k-enh-vxlan-support
2013-09-05 10:59:51 -04:00