summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Remove two sets that are not referenced" into proposed/juno2014.2.rc32014.2proposed/junoJenkins2014-10-142-29/+0
|\
| * Remove two sets that are not referencedCarl Baldwin2014-10-132-29/+0
| | | | | | | | | | | | | | | | | | | | The code no longer references the updated_routers and removed_routers sets. This should have been cleaned up before but was missed. Closes-bug: #1232525 Change-Id: I0396e13d2f7c3789928e0c6a4c0a071b02d5ff17 (cherry picked from commit edb26bfcddf9d9a0e95955a6590d11fa7245ea2b)
* | Merge "Forbid update of HA property of routers" into proposed/junoJenkins2014-10-141-1/+1
|\ \ | |/ |/|
| * Forbid update of HA property of routersAssaf Muller2014-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | While the HA property is update-able, and resulting router-get invocations suggest that the router is HA, the migration itself fails on the agent. This is deceiving and confusing and should be blocked until the migration itself is fixed in a future patch. Change-Id: I4171ab481e3943e0110bd9a300d965bbebe44871 Related-Bug: #1365426 Closes-Bug: #1378525 (cherry picked from commit 1fd7dd99ca7e5e9736200360aa354cada7fb43ff)
* | Add Juno release milestone2014.2.rc2Mark McClain2014-10-092-1/+37
| | | | | | | | | | | | Change-Id: Iea584b00329d9474c14847db958f8743d4058525 Closes-Bug: #1378855 (cherry picked from commit 4e8a5b7de71ba6f8c050c424613c025310498940)
* | Add database relationship between router and portsMark McClain2014-10-084-96/+249
| | | | | | | | | | | | | | | | | | | | Add an explicit schema relationship between a router and its ports. This change ensures referential integrity among the entities and prevents orphaned ports. Change-Id: I09e8a694cdff7f64a642a39b45cbd12422132806 Closes-Bug: #1378866 (cherry picked from commit 93012915a3445a8ac8a0b30b702df30febbbb728)
* | Disable PUT for IPv6 subnet attributesHenry Gessau2014-10-093-63/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Juno we are not ready for allowing the IPv6 attributes on a subnet to be updated after the subnet is created, because: - The implementation for supporting updates is incomplete. - Perceived lack of usefulness, no good use cases known yet. - Allowing updates causes more complexity in the code. - Have not tested that radvd, dhcp, etc. behave OK after update. Therefore, for now, we set 'allow_put' to False for the two IPv6 attributes, ipv6_ra_mode and ipv6_address_mode. This prevents the modes from being updated via the PUT:subnets API. Closes-bug: #1378952 Change-Id: Id6ce894d223c91421b62f82d266cfc15fa63ed0e (cherry picked from commit 8a08a3cb47d0dd69d4aa2e8fa661d04054fe95ae)
* | Skip IPv6 Tests in the OpenContrail pluginSean M. Collins2014-10-091-14/+2
| | | | | | | | | | | | | | | | | | | | Similar to the way we are skipping tests in the OneConvergence plugin, introduced by Kevin Benton in 9294de441e684a81f6e802ba0564083f1ad319d6. Partial-Bug: #1378952 Change-Id: I1650b0708af73ce63e92c55bc842607bb69efe60 (cherry picked from commit 67962943969bc737a3f680a0defc2fc9df03c429)
* | Merge "Removed kombu from requirements" into proposed/junoJenkins2014-10-091-1/+0
|\ \
| * | Removed kombu from requirementsIhar Hrachyshka2014-10-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Since we've replaced oslo-incubator RPC layer with oslo.messaging, we don't ship any code that uses kombu. Change-Id: Ia8a74f1326ecd98c47cbe447f04d475bf61e19d3 (cherry picked from commit 424c7faa75d96950d80f49f20f5414d1a297af72)
* | | Merge "Updated from global requirements" into proposed/junoJenkins2014-10-092-8/+8
|\ \ \ | |/ /
| * | Updated from global requirementsIhar Hrachyshka2014-10-082-8/+8
| |/ | | | | | | Change-Id: Ifb5cac5b1529fef7862f5a63a0d1592f5bcc01d0
* | Imported Translations from TransifexKyle Mestery2014-10-0828-21596/+172
| | | | | | | | Change-Id: I67a0eec64c0e0513df3f3e9f1f3489086f6316f9
* | Merge "Retry getting the list of service plugins" into proposed/junoJenkins2014-10-092-11/+52
|\ \
| * | Retry getting the list of service pluginsDerek Higgins2014-10-072-11/+52
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | On systems that start both neutron-server and neutron-l3-agent together, there is a chance that the first call to neutron will timeout. Retry upto 4 more times to avoid the l3 agent exiting on startup. This should make the l3 agent a little more robust on startup but still not ideal, ideally it wouldn't exit and retry periodically. Change-Id: I2171a164f3f77bccd89895d73c1c8d67f7190488 Closes-Bug: #1353953 Closes-Bug: #1368152 Closes-Bug: #1368795 (cherry picked from commit e7f0b56d74fbfbb08a3b7a0d2da4cefb6fe2aa67)
* | Merge "Allow reading a tenant router's external IP" into proposed/junoJenkins2014-10-086-9/+50
|\ \
| * | Allow reading a tenant router's external IPKevin Benton2014-10-076-9/+50
| |/ | | | | | | | | | | | | | | | | | | | | | | Adds an external IPs field to the external gateway information for a router so the external IP address of the router can be read by the tenant. DocImpact Closes-Bug: #1255142 Change-Id: If4e77c445e9b855ff77deea6c8df4a0b3cf249d4 (cherry picked from commit c7baaa068ed1d3c8b02717232edef60ba1b655f6)
* | Merge "Raise exception if ipv6 prefix is inappropriate for address mode" ↵Jenkins2014-10-082-9/+36
|\ \ | | | | | | | | | into proposed/juno
| * | Raise exception if ipv6 prefix is inappropriate for address modeEugene Nikanorov2014-10-072-9/+36
| |/ | | | | | | | | | | | | | | | | | | | | Address prefix to use with slaac and stateless ipv6 address modes should be equal to 64 in order to work properly. The patch adds corresponding validation and fixes unit tests accordingly. Change-Id: I6c344b21a69f85f2885a72377171f70309b26775 Closes-Bug: #1357084 (cherry picked from commit 0d8911115e1b722da2f1e92f444e53b22223ee32)
* | Merge "Add missing methods to NoopFirewallDriver" into proposed/junoJenkins2014-10-081-0/+14
|\ \
| * | Add missing methods to NoopFirewallDriverEugene Nikanorov2014-10-071-0/+14
| |/ | | | | | | | | | | | | | | | | | | The fix adds missing methods into generic Firewall class and in NoopFirewall driver class. Change-Id: I6402448075ed414434dc007f5c403fc85b6b1456 Closes-Bug: #1369685 Related-Bug: #1365806 (cherry picked from commit 9a6c073656a7e0b1a26b2bca0ba381489d04e322)
* | Don't fail when trying to unbind a routerEd Bak2014-10-072-3/+34
|/ | | | | | | | | | | | | | If a router is already unbound from an l3 agent, don't fail. Log the condition and go on. This is harmless since it can happen due to a delete race condition between multiple neutron-server processes. One delete request can determine that it needs to unbind the router. A second process may also determine that it needs to unbind the router. The exception thrown will result in a port delete failure and cause nova to mark a deleted instance as ERROR. Change-Id: Ia667ea77a0a483deff8acfdcf90ca84cd3adf44f Closes-Bug: 1367892
* remove openvswitch plugin2014.2.rc1Mark McClain2014-10-0113-1781/+33
| | | | | | | | | This changeset removes the openvswitch plugin, but retains the agent for ML2 The database models were not removed since operators will need to migrate the data. Change-Id: I8b519cb2bbebcbec2c78bb0ec9325716970736cf Closes-Bug: 1323729
* Merge "Fix pid file location to avoid I->J changes that break metadata"Jenkins2014-10-022-17/+15
|\
| * Fix pid file location to avoid I->J changes that break metadataMiguel Angel Ajo2014-10-012-17/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | Changes in commit 7f8ae630b87392193974dd9cb198c1165cdec93b moved pid files handled by agent/linux/external_process.py from $state_path/external/<uuid>.pid to $state_path/external/<uuid>/pid that breaks the neutron-ns-metadata-proxy respawn after upgrades becase the l3 or dhcp agent can't find the old pid file so they try to start a new neutron-ns-metadata-proxy which won't succeed, because the old one is holding the port already. Closes-Bug: #1376128 Change-Id: Id166ec8e508aaab8eea35d89d010a5a0b7fdba1f
* | Merge "Update migration scripts to support DB2"Jenkins2014-10-023-31/+95
|\ \
| * | Update migration scripts to support DB2John Kasperski2014-09-293-31/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Three of the migration scripts are causing failures with DB2. - DB2 doesn't support nullable column in primary key - Hard coded SQL statements which use False/True as Boolean arguments are not compatible with DB2. In DB2, Boolean columns are created as small integer with a constraint to allow only 0 & 1. - Hardcoded update rows from other table sql is not compatible with DB2 - Foreign key constraints require additional handling Co-authored-by: Rahul Priyadarshi <rahul.priyadarshi@in.ibm.com> Change-Id: I82e2d1c522b81fed90a1e5cc6f2321f80797cf7b Closes-Bug: #1328019
* | | Merge "remove linuxbridge plugin"Jenkins2014-10-0211-1486/+33
|\ \ \
| * | | remove linuxbridge pluginMark McClain2014-10-0111-1486/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset removes the linuxbridge plugin, but retains the agent for ML2. The database models were not removed since operators will need to migrate the data. Additionally, the ml2 migration script was altered to support Juno. For testing, a user must either run the migration against the icehouse scheme or run the update, manually change alembic_version to juno and then run the migration script. Once the juno migration is added, this manually step will not be required. Change-Id: I70689b4247947e6dc08e80fd9b31da9dc691d259 Partial-Bug: 1323729
* | | | Merge "fix dvr snat bindings for external-gw-clear"Jenkins2014-10-012-38/+65
|\ \ \ \ | |_|_|/ |/| | |
| * | | fix dvr snat bindings for external-gw-clearMichael Smith2014-09-252-38/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When router_gateway_clear happens, the schedule_router calls the unbind_snat_servicenode in the plugin. This will clear the agent binding from the binding table. But the l3-agent was expecting the ex_gw_port binding to be present. The agent needs to check its cache of the router['gw_host_port'] value now. Change-Id: I051fb97d802b0508b30683a33673b85f5ab24000 Closes-bug: #1373524
* | | | Merge "ML2: move L3 cleanup out of network transaction"Jenkins2014-10-012-1/+24
|\ \ \ \
| * | | | ML2: move L3 cleanup out of network transactionKevin Benton2014-09-302-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move _process_l3_delete out of the delete_network transaction to eliminate the semaphore deadlock that occurs when it tries to delete the ports associated with existing floating IPs. It makes more sense to live outside of the transaction anyway because the operations it performs cannot be rolled back only in the database if the L3 plugin makes external calls for floating IP creation/deletion. e.g. if delete_floatingip is successful, it may have deleted external resources and restoring the DB records would make things inconsistent. If a failure to delete the network does occur, any cleanup done by _process_l3_delete will not be reversed. Closes-Bug: #1374573 Change-Id: I3ae7bb269df9b9dcef94f48f13f1bde1e4106a80
* | | | | Imported Translations from TransifexOpenStack Proposal Bot2014-09-302-105/+105
|/ / / / | | | | | | | | | | | | Change-Id: Ie7ba4679ca128ff636b6bd841072dfd4b7e4236f
* | | | Merge "Rename workers to api_workers and simplify code"Jenkins2014-09-295-56/+23
|\ \ \ \
| * | | | Rename workers to api_workers and simplify codeCarl Baldwin2014-09-155-56/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor a few ugly aspects of the multiple API worker patch to make way for multiple rpc workers. This came up as I was trying to add multiple RPC workers using similar patterns and remembering that some things were left in a rather awkward state. Change-Id: I549db67af4af6a2df80e12cf233109dda5213c47
* | | | | Merge "Do not assume order of report list elements"Jenkins2014-09-291-1/+3
|\ \ \ \ \
| * | | | | Do not assume order of report list elementsjohndavidge2014-09-291-1/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the test_report_multiple_services unit test that breaks with a randomized PYTHONHASHSEED (see the bug report). The test assumed that the report list from self.driver.report_status() had elements in a particular order. Found with PYTHONHASHSEED=2455351445. The fix refactors the test case to handle an unsorted report list by sorting it before checking equality. Partial-bug: #1348818 Note: There are several other unrelated unit tests that also break with a randomized PYTHONHASHSEED, but they are not addressed here. They will be addressed in separate patches. Change-Id: I542c3818821fa2f6e460fd254a3842530ecea8d9
* | | | | Imported Translations from TransifexOpenStack Proposal Bot2014-09-2914-1414/+938
|/ / / / | | | | | | | | | | | | Change-Id: I585e3df5504fcc071811e0ec9f925bc493584b2f
* | | | Merge "Fix broken port query in Extraroute test case"Jenkins2014-09-292-4/+6
|\ \ \ \
| * | | | Fix broken port query in Extraroute test caseKevin Benton2014-09-262-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the queries in an extra route test case tries to filter based on the port owner, but the _list_ports method it calls doesn't take a device_owner parameter. This can cause failures if a DHCP port is created on the same subnet. Change-Id: I0e62027ae4d98944ef91a5d457d43d4224441b2f
* | | | | Merge "Do not assume order of body and tags elements"Jenkins2014-09-273-6/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Do not assume order of body and tags elementsJacek Swiderski2014-09-233-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the l2gateway unit test that breaks with a randomized PYTHONHASHSEED (see the bug report). The test assumed that the body dict from self._create_expected_req_body had elements (including contents of tags list) in a particular order. Found with PYTHONHASHSEED=2455351445. The fix ensures that body is in predictable order. Partial-bug: #1348818 Note: There are several other unrelated unit tests that also break with a randomized PYTHONHASHSEED, but they are not addressed here. They will be addressed in separate patches. Change-Id: I423b68aff58486c113d0e5c5f4726f9eabf6920e
* | | | | Merge "Revert "Cleanup floatingips also on router delete""Jenkins2014-09-272-12/+2
|\ \ \ \ \
| * | | | | Revert "Cleanup floatingips also on router delete"armando-migliaccio2014-09-252-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c3326996e38cb67f8d4ba3dabd829dc6f327b666. The patch being reverted here addresses an issue that can no longer be reproduced, in that under no circumstances, I can make the FIP lie around before deleting a router (which can only be done after all FIP have been disassociated or released). Unless we have more clarity as to what the initial commit was really meant to fix, there is a strong case for reverting this patch at this point. Closes-bug: #1373100 Change-Id: I7e0f80e456ff4d9eb57a1d31c6ffc7cdfca5a163
* | | | | | Merge "Add unit tests covering single operations to ODL"Jenkins2014-09-272-64/+231
|\ \ \ \ \ \
| * | | | | | Add unit tests covering single operations to ODLCédric Ollivier2014-08-222-64/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds the remaining test cases (create and update operations) to fully cover sync_single_resource. It also defines the filter_* methods as static or class methods and removes their duplicate arguments. Change-Id: I6b6153ea577bd685576690559b1c389490ee525d Closes-Bug: #1325184
* | | | | | | Merge "Eliminate OrderedDict from test_api_v2.py"Jenkins2014-09-271-2/+1
|\ \ \ \ \ \ \
| * | | | | | | Eliminate OrderedDict from test_api_v2.pyKevin L. Mitchell2014-09-221-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Neutron cannot possibly be passing tests under Python 2.6, as neutron/tests/unit/test_api_v2.py is referencing collections.OrderedDict, which does not exist in Python 2.6. Since there is no reason to use an OrderedDict in this case, this replaces it with a simple dict. Change-Id: I1b9886f508c4c8b96cf50c50f157c1960da433fc Closes-Bug: #1372571
* | | | | | | | Merge "Stop admin using other tenants unshared rules"Jenkins2014-09-263-3/+65
|\ \ \ \ \ \ \ \
View Lorry Controller Status