3547 Commits

Author SHA1 Message Date
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
Derek Higgins
becadd39df Move declaration of int_br_device_count earlier
_report_state is being called by setup_rpc so int_br_device_count needs
to be initialized earlier. To avoid
AttributeError: object has no attribute 'int_br_device_count'

This wasn't caught by unit tests for 3 separate reason
o The reference to self.int_br_device_count is wrapped in
  except Exception: log / pass
- This reference has been moved outside of the try/except

o Unit tests set report_interval to 0 so the heartbeat wasn't called
  during unit tests.
- now removed

o The function passed into FixedIntervalLoopingCall isn't started
  anyways so wasn't calling self._report_state
- replaced FixedIntervalLoopingCall with a mock that calls the
  function once.

Fixes bug #1221054

Change-Id: I572af4ee017c1f7f016c8f9981ca54d1301442d1
2013-09-05 15:00:37 +01:00
Jenkins
81d2352724 Merge "Implement MidoNet Neutron plugin for Havana" 2013-09-05 12:45:57 +00:00
Jenkins
384d4d98f7 Merge "Iptables metering driver" 2013-09-05 12:07:09 +00:00
Jenkins
a7751b89a2 Merge "Add method to get iptables traffic counters" 2013-09-05 12:07:01 +00:00
Jenkins
be152bfdba Merge "Allow None for binding:profile attribute" 2013-09-05 12:06:32 +00:00
Jenkins
d9029a3398 Merge "Ensure unit tests do not let looping calls roam freely" 2013-09-05 10:59:40 +00:00
Aaron Rosen
0efce6195f Implement Allowed Address Pairs
The following patch adds the concept of allowed address pairs.
This allows one to add additional ip/mac address pairs on a port to
allow traffic that matches those specified values. This is useful in order
to leverage dataplane failover mechanisms like vrrp. This patch adds support
for the NVP plugin, the OVS plugin, and Ml2.

DocImpact

implements blueprint: allowed-address-pairs

Change-Id: Ie73b3886c5be8e1fc4ade86a0cfb854267f345ac
2013-09-05 03:53:59 -07:00
OpenStack Jenkins
f74185a2ce Merge "Imported Translations from Transifex" 2013-09-05 10:13:04 +00:00
Jenkins
28f74220d3 Merge "VCNS driver implementation" 2013-09-05 09:58:01 +00:00
Jenkins
61a0574ab2 Merge "ML2 Mechanism Driver for Cisco Nexus" 2013-09-05 07:47:06 +00:00
OpenStack Jenkins
18eea48601 Imported Translations from Transifex
Change-Id: I6d5621e3af8df67133ab4689bd6df52c1a82cb75
2013-09-05 06:14:24 +00:00
Jenkins
0f5e2bd607 Merge "Add support for the multiprovider API to ML2" 2013-09-05 06:01:30 +00:00
garyduan
d6f28ffc9b vArmour gateway agent and FWaaS driver
This patch enables vArmour's routing and firewall services to be deployed in
openstack environment.
- as gateway for internal networks
- support SNAT and DNAT (floating IP)
- FWaaS services

Implements: blueprint varmour-fwaas-driver
Change-Id: I6ddfa3137ed7e2a3fcf16a764d1340a8eae9359a
2013-09-04 21:03:25 -07:00
armando-migliaccio
d834935648 Use admin context to retrieve metadata ports in NVP plugin
The port that connects the router and the metadata
network is created with admin context, so use the
elevated one.

Change-Id: Idd416fe0841f6aea80da3a3b66a80a451e0360fd
Closes-Bug: 1220877
2013-09-04 18:07:26 -07:00