12990 Commits

Author SHA1 Message Date
Jenkins
e811983b2d Merge "Ensure that decomposed plugins do not break" 2016-01-11 14:41:20 +00:00
Jenkins
399a6f88dd Merge "Fix Security-rule's port should not set to 0 when Protocol is TCP/UDP" 2016-01-11 14:40:54 +00:00
Jenkins
ae69765be0 Merge "DVR: optimize check_ports_exist_on_l3_agent()" 2016-01-11 14:34:16 +00:00
Jenkins
c62e69c6c4 Merge "Remove check on dhcp enabled subnets while scheduling dvr" 2016-01-11 14:31:54 +00:00
Jenkins
5def2dcd74 Merge "Updated from global requirements" 2016-01-11 07:49:26 +00:00
OpenStack Proposal Bot
7022b2e278 Updated from global requirements
Change-Id: Ifdb68288c0b6538dee345e7b041891aab4910360
2016-01-10 14:36:11 +00:00
Kevin Benton
89f96e627f Ensure agent binding modules are loaded
This patch ensures that models_v2 and the router db module
import the agent binding modules so their models are defined
in the sqlalchemy metadata. Otherwise, using an agentless
core/L3 plugin may result in a failure to initialize if nothing
imported the agent module.

Change-Id: I77240462b618d6e95c7c5862441d6d179e371f4f
Closes-Bug: #1529022
2016-01-10 14:09:38 +00:00
Jenkins
19fa34afd1 Merge "Remove references to model_base through models_v2" 2016-01-10 13:43:40 +00:00
Jenkins
0399f8383f Merge "Simplify extension processing" 2016-01-10 11:19:24 +00:00
Jenkins
6c5ecdc0e6 Merge "devstack: don't enable qos service with the plugin" 2016-01-09 17:10:23 +00:00
Gary Kotton
584d960a93 Ensure that decomposed plugins do not break
Commit 5d53dfb8d64186b5b1d2f356fbff8f222e15d1b2 removed the
method _get_tenant_id_for_create. This is used by various plugins
and the *aaS libaries.

Change-Id: I6d5e2555d6c198102a3d5400609f1d671e0d388d
2016-01-09 00:15:22 -08:00
Jenkins
aa9cc3f9da Merge "LBaaS tests code removal" 2016-01-09 07:49:54 +00:00
Jenkins
be13217325 Merge "HACKING: align the underline text and header" 2016-01-09 06:48:07 +00:00
Jenkins
8fd6456483 Merge "Provide pointer for ML2 extension manager to effective guide" 2016-01-09 04:50:42 +00:00
Jenkins
5eadcd9d75 Merge "DVR: Rename dvr_vmarp_table_update" 2016-01-09 04:50:21 +00:00
Jenkins
5659fe1e82 Merge "Fix uuid passing in disable_isolated_metadata_proxy" 2016-01-09 04:24:34 +00:00
Jenkins
700abe95be Merge "Refactor the subnetpools API tests" 2016-01-09 04:22:55 +00:00
Jenkins
0e755ea8f8 Merge "Utils: Add missing translation to exception" 2016-01-09 00:41:53 +00:00
Jenkins
0eed45d703 Merge "Fix incorrect classmethod declaration" 2016-01-08 21:20:57 +00:00
Assaf Muller
a6c157938a LBaaS tests code removal
Since the API tests have been moved to the neutron_lbaas
tree, left over cruft may now be removed.

Change-Id: I7e3c3bd51c3621f6b1cc695838c618aee2130066
2016-01-08 16:15:15 -05:00
Swaminathan Vasudevan
6960cc133c DVR: Rename dvr_vmarp_table_update
This dvr_vmarp_table_update is not only used to update
the arp entry for the VM ports, but also for other
DVR service ports.

So the function name is kind of misleading and hence
changing it to an appropriate name that fits its function.

Change-Id: I6d5b0b717dcff964a514c83b0cd60b044411f0db
2016-01-08 17:53:23 +00:00
Jenkins
70cd83daf2 Merge "Add firewall blink + remote SG functional tests" 2016-01-08 15:54:47 +00:00
Jenkins
ca567fdab0 Merge "Add test cases to testing firewall drivers" 2016-01-08 15:54:07 +00:00
Jenkins
74d6c7332b Merge "select router with subnet's gateway_ip for floatingip" 2016-01-08 14:35:26 +00:00
Jenkins
fa6e77c0c4 Merge "Check missed ip6tables utility" 2016-01-08 14:29:51 +00:00
Jenkins
c139299903 Merge "Keep py3.X compatibility for urllib" 2016-01-08 12:17:45 +00:00
Jenkins
b6a2a659e4 Merge "Support rootwrap sysctl and conntrack commands for non-l3 nodes" 2016-01-08 11:59:08 +00:00
Jenkins
0d77401ceb Merge "Create a routing table manager" 2016-01-08 11:43:31 +00:00
Jenkins
c6dc0022de Merge "DVR: Rename dvr_update_router_addvm function" 2016-01-08 08:06:04 +00:00
Jenkins
c676c5f6cf Merge "SR-IOV: Fix macvtap assigned vf check when kernel < 3.13" 2016-01-08 08:03:52 +00:00
Jenkins
e534c88452 Merge "fix call which is only specific to enhanced_rpc" 2016-01-08 07:21:15 +00:00
Jenkins
fd4be32712 Merge "Fixing the deprecated library function." 2016-01-08 04:08:14 +00:00
Jenkins
5a299de6ca Merge "Unify assertEqual for empty usages" 2016-01-08 04:07:36 +00:00
Jenkins
3082949cff Merge "Avoid duplicating tenant check when creating resources" 2016-01-08 03:56:28 +00:00
Jenkins
60c1f99655 Merge "Kilo initial migration" 2016-01-08 03:45:27 +00:00
Carl Baldwin
6a350bf950 Create a routing table manager
The routing table manager maps address scope ids to routing tables.
It uses the rt_tables file specific to each namespace to maintain the
mapping so that id can simply be used as the table name when running
iproute2 commands.  This will be useful when debugging.

Change-Id: Icd5e98c82a070045a50e0c5d3762906b7e159d3d
Partially-Implements:  blueprint address-scopes
2016-01-08 00:36:34 +00:00
Shih-Hao Li
5bd76c5284 Fix uuid passing in disable_isolated_metadata_proxy
In DhcpAgent, when enable_isolated_metadata_proxy() spawns
a metadata proxy agent for a network, it will pass router_id
instead of network_id if metadata network is enabled and
a router port is connected to this network.

Later, MetadataDriver will register this uuid (i.e. router_id)
with monitor for the new metadata proxy process.

But when disable_isolated_metadata_proxy() destroys a metadata
proxy agent for a network, it always passes network_id as the uuid.
Thus MetadataDriver can not find the matching process. So the
corresponding metadata proxy agent can not be destroyed.

Closes-bug: #1526084
Change-Id: Icab94f4e09e95fa6729c458522a3fe50e850a4be
2016-01-08 00:25:27 +00:00
Brian Haley
ddfa00fec0 Fix incorrect classmethod declaration
pylint complains about this:

************* Module neutron.tests.api.base
C:207, 4: Class method _try_delete_resource should have 'cls' as
first argument (bad-classmethod-argument)

Change-Id: I189c54a2c641b97579761ff37c8f87077037697b
2016-01-07 15:12:24 -05:00
Gary Kotton
0bd2b816a0 Utils: Add missing translation to exception
Add a missing translation.

TrivialFix

Change-Id: I2a87704ea12800c377659d59b2ad623fcaf0c802
2016-01-07 03:29:52 -08:00
lzklibj
3491cbc0c5 Unify assertEqual for empty usages
Update previous assertEqual(observed, *empty) usages to
assertEqual(*empty*, observed).

This patch aslo update hacking check for assertEqual with
empty types.

Change-Id: I981277618f92254a5beb9d3308a317d8c14e125c
2016-01-07 10:06:35 +00:00
Moshe Levi
d760416998 SR-IOV: Fix macvtap assigned vf check when kernel < 3.13
when creating macvtap passthrough to SR-IOV VF in Kernel >= 3.13 an
upper_macvtap symbolic link is created. For Kernel < 3.13 the only
way to know it is by parsing the ip link show output and look for
macvtap[0-9]+@<vf ifname>.

This patch used the ip link show command to detects
macvtap assigned vf so that detection of macvtap assigned vf
will work on all kernels

Closes-Bug: #1523083
Change-Id: Icbc8d6af5c00d1453095e04dd779210dc7244c7f
2016-01-07 09:38:39 +01:00
Jenkins
3bcc1c3d4c Merge "Separate the command for replace_port to delete and add" 2016-01-07 04:50:56 +00:00
Jenkins
dec01b8583 Merge "ovs_vhostuser: fix vhostuser_socket_dir typo" 2016-01-07 01:37:36 +00:00
Jenkins
5b0c20ebe4 Merge "Remove openstack.common._i18n from Neutron" 2016-01-07 01:37:12 +00:00
Carl Baldwin
bf2f1f1f87 Remove references to model_base through models_v2
I saw a patch set [1] that was running in to circular imports and
removing these.  I thought it'd be better to remove them all in one
shot.

[1] https://review.openstack.org/#/c/261222/1/neutron/db/agents_db.py

Change-Id: If1a9ba3091ac99f01f73b98a7459358c3efd4dd5
2016-01-06 16:12:29 -07:00
Kevin Benton
8e54248653 Allow get_unused_ip method to skip v6 and fix iter
Skip IPv6 subnets when looking for an unused IP in the
floating IP tests since floating IPs cannot be requested
with v6 addresses.

This also fixes the iterator for the non-allocation pool
case.

Closes-Bug: #1531706
Change-Id: Id0b2c28970ab61e45755818e3e0798daa4453ce7
2016-01-06 13:27:54 -08:00
Jenkins
ecc108caa8 Merge "Revert "Revert "Revert "Remove TEMPEST_CONFIG_DIR in the api tox env"""" 2016-01-06 20:48:14 +00:00
Jenkins
bf11ed7430 Merge "Introduce an API test for specified floating ip address" 2016-01-06 20:45:05 +00:00
Jenkins
dc0706b534 Merge "Don't snat traffic between fixed IPs behind same router" 2016-01-06 20:44:40 +00:00
Jenkins
37a9594aa4 Merge "Remove l2pop _get_port_infos method" 2016-01-06 20:44:19 +00:00