Commit Graph

3990 Commits

Author SHA1 Message Date
Jenkins
9073e04f57 Merge "Modified configuration group name to lowercase" 2013-10-29 09:28:19 +00:00
Jenkins
99da250353 Merge "Fix incorrect indentations found by Pep 1.4.6+" 2013-10-28 22:04:19 +00:00
Sridhar S
b9cb30ade7 Modified configuration group name to lowercase
Most of the OpenStack project makes use of lower case for
configuration group names. But, 'neutron' was having group
names in either cases. Bug states it is fine to have group
name in upper case for [DEFAULT] but needs to be changed
for others. It was noted that [PLUMgridDirector] was having
characters.

Change-Id: I95f2dad6d5ae17f722202f4917b6ef460cd41e15
Closes-Bug: #1176683
2013-10-28 11:39:38 +05:30
Jenkins
a8c3c0c1ab Merge "Fix error while creating l2 gateway services in nvp" 2013-10-27 23:16:38 +00:00
Jenkins
07516785ff Merge "LBaaS: Fix incorrect pool status change" 2013-10-27 07:47:12 +00:00
Jenkins
d1db2ffcbc Merge "Ensure OVS plugin is loaded in OVS plugin test" 2013-10-26 21:44:12 +00:00
Jenkins
fd952c9fbe Merge "NVP: Correct NVP router port mac to match neutron" 2013-10-26 16:41:42 +00:00
Akihiro MOTOKI
31def3ccf4 Ensure OVS plugin is loaded in OVS plugin test
In TestOpenvswitchSGServerRpcCallBack and NetworkBindingsTest
in OVS plugin tests, OVS plugin was not loaded properly.

* For NetworkBindingsTest, it can be fixed by changing setUp()
  to take 'plugin' arguments in the base test classes
  SecurityGroupDBTestCase and SGServerRpcCallBackMixinTestCase.
  This fixes bug 1242510 in ML2 unit tests.

* For NetworkBindingsTest, it can be fixed by passing the plugin
  class to super.setUp(). The test itself needs to be updated
  because network binding is added when a network is created.

* NetworkBindingsTest in Linux Bridge plugin has the same issue,
  so it is also fixed in this patch.

Closes-Bug: #1230083
Closes-Bug: #1242510
Change-Id: I914876225480585d822748c188e9b69d1adf46f3
2013-10-26 20:52:15 +09:00
Jenkins
0d9e0e1ca6 Merge "Utilizes assertIsNone and assertIsNotNone" 2013-10-26 01:37:25 +00:00
armando-migliaccio
94950eeb22 Fix error while creating l2 gateway services in nvp
Ensure that Conflict errors are not masked; also ensure
that coding errors do not mask NVP API errors.

Fixes bug #1244259

Change-Id: I27586d72af89fd39f6443dbab33f0e4e762b0c99
2013-10-25 16:35:08 -07:00
Jenkins
8d37412d35 Merge "Removing workflows from the Radware driver code" 2013-10-25 21:38:22 +00:00
Jenkins
5a1b54def0 Merge "fix nvp version validation for distributed router creation" 2013-10-25 21:32:01 +00:00
Jenkins
35e81bccc7 Merge "Make test_nvp_sync.SyncLoopingCallTestCase reliable" 2013-10-25 21:14:13 +00:00
Jenkins
179e536a7f Merge "Fix a copy&paste typo" 2013-10-25 21:14:03 +00:00
Jenkins
7bb750e11d Merge "Remove uneeded variable AGENT_NAME" 2013-10-25 21:13:13 +00:00
OpenStack Jenkins
af40ed575e Merge "Imported Translations from Transifex" 2013-10-25 19:57:11 +00:00
Jenkins
8293302a2e Merge "Fix update_device_up method of linuxbridge plugin" 2013-10-25 19:49:27 +00:00
Jenkins
bca957545e Merge "Enable one disabled tests in NEC plugin that blocked by 1229954" 2013-10-25 18:56:40 +00:00
Eugene Nikanorov
01e45596fa Fix update_device_up method of linuxbridge plugin
Also add unit tests covering update_device_up and update_device_down
methods

Change-Id: I97f2f9249b684aa5350b3f0621754543e80bec70
Closes-Bug: #1241602
2013-10-25 18:40:17 +04:00
Eugene Nikanorov
c9b6c15d5d LBaaS: Fix incorrect pool status change
Avoid incorrect status change when deleting the pool.
We can check for the conditions prior putting the pool
to PENDING_DELETE state, in case delete conditions are met
it is safe to change the state to PENDING_DELETE.
Also, change create_vip and update_vip operations to respect
PENDING_DELETE and avoid race conditions.

Change-Id: I9f526901eb85bdb83cf4ff8131460eb592c900f8
Closes-Bug: #1242338
2013-10-25 14:48:14 +04:00
OpenStack Jenkins
e642518244 Imported Translations from Transifex
Change-Id: Ibf9a7c3cdf6725807a2a3183937f0d8e99273744
2013-10-25 06:35:53 +00:00
Jenkins
84a847429a Merge "Handle 405 error codes correctly in NVP plugin" 2013-10-25 02:57:16 +00:00
Jenkins
0bbbf66da0 Merge "Fix argument mismatch failure for neutron-check-nvp-config" 2013-10-25 02:46:36 +00:00
OpenStack Jenkins
88ff5ea00b Merge "Updated from global requirements" 2013-10-25 02:46:27 +00:00
Jenkins
c20c7e6da8 Merge "Fix TypeError: <MagicMock name='LinuxBridgeManager().local_ip'" 2013-10-25 02:42:08 +00:00
Aaron Rosen
7014589472 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
2013-10-24 18:38:15 -07:00
OpenStack Jenkins
d7ee301f90 Merge "Imported Translations from Transifex" 2013-10-24 18:19:50 +00:00
OpenStack Jenkins
daef09eec1 Updated from global requirements
Change-Id: Ifbcffab245f7dee50f5a84489011e220a3f8fea8
2013-10-24 13:16:21 +00:00
Avishay Balderman
3ae0171834 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
2013-10-24 15:14:47 +02:00
OpenStack Jenkins
1e0fe5a2f5 Imported Translations from Transifex
Change-Id: Iacabec05e369340634cd36231d4e2ced64e0543c
2013-10-24 06:35:52 +00:00
Christian Berendt
10639b5b67 change assertEquals to assertEqual
According to http://docs.python.org/2/library/unittest.html
assertEquals is a deprecated alias of assertEqual.

Change-Id: I4030e9f9b184af60eb9253b3a1d7e1cc929d502d
2013-10-24 07:35:00 +02:00
Aaron Rosen
d26dfed7d4 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
2013-10-24 02:24:56 +00:00
Jenkins
30ba5b38fe Merge "Spawn arping in thread to speed-up floating IP" 2013-10-23 21:23:38 +00:00
armando-migliaccio
e3e4a3fa2d Fix argument mismatch failure for neutron-check-nvp-config
Use sys.argv directly.

Fix bug #1243888

Change-Id: I9cb6ca841d004baf72dd68e44be673c361c2ed05
2013-10-23 12:13:39 -07:00
armando-migliaccio
9eb06332f0 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
2013-10-23 12:11:29 -07:00
armando-migliaccio
66515056bf 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
2013-10-23 10:17:17 -07:00
Zhongyue Luo
4114b91ca0 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
2013-10-23 10:59:16 +08:00
Aaron Rosen
8c73357def Remove uneeded variable AGENT_NAME
Fixes bug: 1243464

Change-Id: I833dd64e98c679c050aa958576c7726bfa15cc8e
2013-10-22 17:08:00 -07:00
Jenkins
7ce5368ee0 Merge "change NetworkVxlanPortRangeError to base NeutronException" 2013-10-22 19:52:30 +00:00
Jenkins
4f4b00066b Merge "Update send_arp_for_ha default in l3_agent.ini" 2013-10-22 18:51:56 +00:00
Darragh O'Reilly
4a6e77e316 Update send_arp_for_ha default in l3_agent.ini
The default for send_arp_for_ha was 3 and is now 0.
This patch changes the comment in l3_agent.ini to
show the new default.

Change-Id: I77370350ffee6ad7b94aa7db341c062ebc0b7d89
2013-10-21 17:09:28 +00:00
Yong Sheng Gong
cf3af07cfd change NetworkVxlanPortRangeError to base NeutronException
Closes-Bug #1242756

Change-Id: I902fa12795cda5ca70defaeb3b6959e3a0824565
2013-10-21 23:34:53 +08:00
Yong Sheng Gong
0dd9315bd5 change seld into self
Closes-Bug #1242745

Change-Id: If5cc2864dc966eacd4cf30757fd1de15d9992629
2013-10-21 23:19:39 +08:00
Francois Deppierraz
9910ee0a13 Fix a copy&paste typo
Change-Id: I970d3cd51f83c963b04e24294e982a0807d1c1c3
2013-10-20 13:53:11 +02:00
Jenkins
a04e91db98 Merge "Fix lb doesn't remove vxlan int. if no int. map" 2013-10-19 21:17:33 +00:00
Jenkins
743ad968a1 Merge "Add error log for SystemExit in dhcp-agent" 2013-10-19 20:04:46 +00:00
OpenStack Jenkins
93a960550c Merge "Updated from global requirements" 2013-10-19 19:36:44 +00:00
Jenkins
ed2b0c44af Merge "Fix to not send fdb updates when no port changes" 2013-10-19 19:21:07 +00:00
OpenStack Jenkins
ffaa8b9b14 Updated from global requirements
Change-Id: Ica7315effe308bd739e90f885849fac27a3c542b
2013-10-19 15:38:27 +00:00
Salvatore Orlando
4e311e66de Make test_nvp_sync.SyncLoopingCallTestCase reliable
This patch removes the previous check that verified the mocked
looping call had an exact number of calls, and replaces it with a
simpler check that just verifies that the mock has been called.

As a consequence, this patch also shortens the test duration.

Closes-Bug: 1241969

Change-Id: Ia7bc66e1f2f631e46ddcbe0eacc1d5b2481274cb
2013-10-19 03:01:26 -07:00