Hello community, here is the log from the commit of package openstack-neutron for openSUSE:Factory checked in at 2014-01-20 07:11:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-neutron (Old) and /work/SRC/openSUSE:Factory/.openstack-neutron.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-neutron" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-neutron/openstack-neutron.changes 2013-11-20 11:05:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-neutron.new/openstack-neutron.changes 2014-01-23 15:50:39.000000000 +0100 @@ -1,0 +2,190 @@ +Thu Jan 16 10:01:19 UTC 2014 - [email protected] + +- fix openstack.neutron.init to not start before DB and rabbitmq + +------------------------------------------------------------------- +Thu Jan 16 10:00:39 UTC 2014 - [email protected] + +- fix ovs-cleanup being run without config file + +------------------------------------------------------------------- +Thu Jan 16 01:19:16 UTC 2014 - [email protected] + +- Update to version 2013.2.2.dev15.g5bbc2f0: + + Add binding:host_id when creating port for probe + +------------------------------------------------------------------- +Wed Jan 15 10:26:39 UTC 2014 - [email protected] + +- Allow specifying multiple additional config files in + /etc/sysconfig/neutron. This is e.g. needed when using + ml2_conf_cisco.ini for the cisco_nexus mechanism driver + +------------------------------------------------------------------- +Tue Jan 14 00:42:20 UTC 2014 - [email protected] + +- Update to version 2013.2.2.dev14.gb5c4152: + + NVP plugin:fix connectivity to fip from internal nw + +------------------------------------------------------------------- +Mon Jan 13 11:03:38 UTC 2014 - [email protected] + +- switch to ML2 network plugin by default (with linuxbridge) + +------------------------------------------------------------------- +Fri Jan 10 21:31:21 UTC 2014 - [email protected] + +- fix check_migration call on start + +------------------------------------------------------------------- +Thu Jan 9 00:43:20 UTC 2014 - [email protected] + +- Update to version 2013.2.2.dev13.g94679f1: + + Fix check_nvp_config erroneous complaint + + Catch PortNotFound exception during get_dhcp_port + +------------------------------------------------------------------- +Wed Jan 8 15:22:29 UTC 2014 - [email protected] + +- Add VMWare NSX configuration to provide new agent package + +------------------------------------------------------------------- +Wed Dec 25 01:39:02 UTC 2013 - [email protected] + +- Update to version 2013.2.2.dev10.g7a4842d: + + Change default eswitchd port to avoid conflict + +------------------------------------------------------------------- +Sun Dec 22 01:17:31 UTC 2013 - [email protected] + +- Update to version 2013.2.2.dev9.g3f4c282: + + Reduce the severity of dhcp related log traces + +------------------------------------------------------------------- +Fri Dec 20 15:12:15 UTC 2013 - [email protected] + +- Update to version 2013.2.2.dev8.g7f4054c: + + NVP: propagate net-gw update to backend + + Add fwaas_driver.ini to setup.cfg + +------------------------------------------------------------------- +Wed Dec 18 00:45:53 UTC 2013 - [email protected] + +- Update to version 2013.2.2.dev4.g140f3cb: + + Fix unable to add allow all IPv4/6 security group rule + +------------------------------------------------------------------- +Tue Dec 17 00:49:45 UTC 2013 - [email protected] + +- Update to version 2013.2.2.dev2.ge79771e: + + Bump stable/havana next version to 2013.2.2 + +------------------------------------------------------------------- +Mon Dec 16 09:29:17 UTC 2013 - [email protected] + +- fix requires + +------------------------------------------------------------------- +Mon Dec 16 00:41:59 UTC 2013 - [email protected] + +- Update to version 2013.2.1.dev53.gc48641a: + + Fix argument mismatch failure for neutron-check-nvp-config + +------------------------------------------------------------------- +Sun Dec 15 00:48:36 UTC 2013 - [email protected] + +- Update to version 2013.2.1.dev52.gc783944: + + Add X-Tenant-ID to metadata request + +------------------------------------------------------------------- +Sat Dec 14 01:04:32 UTC 2013 - [email protected] + +- Update to version 2013.2.1.dev50.g42da48e: + + Updated from global requirements + +------------------------------------------------------------------- +Wed Dec 11 01:27:34 UTC 2013 - [email protected] + +- Update to version 2013.2.1.dev49.gcec8127: + + Creates multiple worker processes for API server + +------------------------------------------------------------------- +Mon Dec 9 12:51:24 UTC 2013 - [email protected] + +- Update to version 2013.2.1.dev47.g3383241: + + Add vpnaas and debug filters to setup.cfg + + Ensure NVP API connection port is always an integer + + Support uncompressed ipv6 address and abbreviated ipv4 address + + Sync openstack.common.local from oslo + + Sync rpc fix from oslo-incubator +- Package /etc/rootwrap.d/debug.filters and /etc/rootwrap.d/vpnaas.filters + +------------------------------------------------------------------- +Sat Dec 7 01:23:48 UTC 2013 - [email protected] + +- Update to version 2013.2.1.dev37.gb52de8a: + + Mocking ryu plugin notifier in ryu plugin test + +------------------------------------------------------------------- +Fri Dec 6 10:52:47 UTC 2013 - [email protected] + +- Update to version 2013.2.1.dev36.gc93d699: + + Fix OVS agent reclaims local VLAN + +------------------------------------------------------------------- +Wed Dec 4 14:58:31 UTC 2013 - [email protected] + +- Remove equals from command line arguments in .init files (see + https://answers.launchpad.net/neutron/+question/216451) + +------------------------------------------------------------------- +Tue Dec 3 01:20:47 UTC 2013 - [email protected] + +- Update to version 2013.2.1.dev34.g7d74411: + + Linux device name can have '@' or ':' characters + +------------------------------------------------------------------- +Thu Nov 28 15:55:24 UTC 2013 - [email protected] + +- add init script for neutron-ovs-cleanup (bnc#848790) +- always run neutron-ovs-cleanup first + +------------------------------------------------------------------- +Thu Nov 28 00:57:17 UTC 2013 - [email protected] + +- Update to version 2013.2.1.dev32.g496e6f0: + + Fix DB integrity issues when using postgres + + Lower severity of log trace for DB integrity error + +------------------------------------------------------------------- +Wed Nov 27 09:17:04 UTC 2013 - [email protected] + +- added: 0001-Reassign-IP-to-vlan-interface-when-deleting-a-VLAN-b.patch + (lp#1255153) + +------------------------------------------------------------------- +Wed Nov 27 01:23:31 UTC 2013 - [email protected] + +- Update to version 2013.2.1.dev28.g39c392e: + + Refactor configuring of floating ips on a router + + Fix TypeError: <MagicMock name='LinuxBridgeManager().local_ip' + +------------------------------------------------------------------- +Tue Nov 26 00:45:22 UTC 2013 - [email protected] + +- Update to version 2013.2.1.dev24.g3be1326: + + Removes unused nvp plugin config param + +------------------------------------------------------------------- +Mon Nov 25 10:51:18 UTC 2013 - [email protected] + +- Update to version 2013.2.1.dev22.g37f5678: + + Fix update_device_up method of linuxbridge plugin + + Tune up report and downtime intervals for l2 agent + +------------------------------------------------------------------- +Mon Nov 25 10:50:45 UTC 2013 - [email protected] + +- remove 0001-Fix-update_device_up-method-of-linuxbridge-plugin.patch + +------------------------------------------------------------------- Old: ---- 0001-Fix-update_device_up-method-of-linuxbridge-plugin.patch New: ---- 0001-Reassign-IP-to-vlan-interface-when-deleting-a-VLAN-b.patch openstack-neutron-ovs-cleanup.init ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-neutron-doc.spec ++++++ --- /var/tmp/diff_new_pack.9Ii9mc/_old 2014-01-23 15:50:40.000000000 +0100 +++ /var/tmp/diff_new_pack.9Ii9mc/_new 2014-01-23 15:50:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package openstack-neutron-doc # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define component neutron Name: openstack-neutron-doc -Version: 2013.2.1.dev19.g27ce7b5 +Version: 2013.2.2.dev15.g5bbc2f0 Release: 0 Summary: OpenStack Virtual Network Service (Neutron) - Documentation License: Apache-2.0 @@ -59,7 +59,7 @@ This package contains documentation files for openstack-%{component} %prep -%setup -q -n neutron-2013.2.1.dev19.g27ce7b5 +%setup -q -n neutron-2013.2.2.dev15.g5bbc2f0 %openstack_cleanup_prep %build ++++++ openstack-neutron.spec ++++++ --- /var/tmp/diff_new_pack.9Ii9mc/_old 2014-01-23 15:50:40.000000000 +0100 +++ /var/tmp/diff_new_pack.9Ii9mc/_new 2014-01-23 15:50:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package openstack-neutron # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ %define username openstack-%{component} Name: openstack-neutron -Version: 2013.2.1.dev19.g27ce7b5 +Version: 2013.2.2.dev15.g5bbc2f0 Release: 0 Summary: OpenStack Network License: Apache-2.0 @@ -33,7 +33,10 @@ Source3: neutron-sudoers Source4: openstack-%{component}-plugin.init Source5: sysconfig.neutron -Patch0: 0001-Fix-update_device_up-method-of-linuxbridge-plugin.patch +Source6: openstack-%{component}-ovs-cleanup.init +# PATCH-FIX-UPSTREAM: Reassign IP to vlan interface when deleting a VLAN bridge +# https://launchpad.net/bugs/1255153 +Patch1: 0001-Reassign-IP-to-vlan-interface-when-deleting-a-VLAN-b.patch BuildRequires: crudini BuildRequires: fdupes BuildRequires: openstack-suse-macros @@ -86,7 +89,7 @@ Requires: python-eventlet >= 0.13.0 Requires: python-greenlet >= 0.3.2 Requires: python-httplib2 -Requires: python-iso8601 >= 0.1.4 +Requires: python-iso8601 >= 0.1.8 Requires: python-jsonrpclib Requires: python-keystoneclient >= 0.3.2 Requires: python-kombu >= 2.4.8 @@ -97,7 +100,7 @@ Requires: python-pbr >= 0.5.21 Requires: python-pyudev Requires: python-requests >= 1.1 -Requires: python-six +Requires: python-six >= 1.4.1 Requires: python-stevedore >= 0.10 Provides: python-quantum = 2013.2.0 Obsoletes: python-quantum < 2013.2.0 @@ -109,7 +112,7 @@ Summary: OpenStack Network - Python module Group: Development/Languages/Python PreReq: %name = %version -Requires: python-Babel >= 0.9.6 +Requires: python-Babel >= 1.3 Provides: openstack-quantum-server = 2013.2.0 Obsoletes: openstack-quantum-server < 2013.2.0 @@ -234,6 +237,19 @@ %description openvswitch-agent This package provides the OpenVSwitch Agent. +%package vmware-agent +Summary: OpenStack Network - VMWare NSX +Group: Development/Languages/Python +Provides: openstack-neutron-agent = %version +PreReq: %name = %version +Requires: openvswitch +Provides: openstack-quantum-vmware-agent = 2013.2.0 +Obsoletes: openstack-quantum-vmware-agent < 2013.2.0 + +%description vmware-agent +This package contains the OpenStack Network plugin that implements virtual +networks using Nicira NVP. + %package vpn-agent Summary: OpenStack Network - VPN Agent Group: Development/Languages/Python @@ -285,8 +301,8 @@ of OpenStack Neutron. %prep -%setup -q -n neutron-2013.2.1.dev19.g27ce7b5 -%patch0 -p1 +%setup -q -n neutron-2013.2.2.dev15.g5bbc2f0 +%patch1 -p1 ## comment me in # %xopenstack_cleanup_prep @@ -319,6 +335,7 @@ hyperv-agent \ openvswitch-agent \ linuxbridge-agent \ + vmware-agent \ metadata-agent \ metering-agent \ mlnx-agent \ @@ -331,6 +348,7 @@ /etc/%{component}/plugins/hyperv/hyperv_neutron_plugin.ini \ /etc/%{component}/plugins/openvswitch/ovs_neutron_plugin.ini \ /etc/%{component}/plugins/linuxbridge/linuxbridge_conf.ini \ + /etc/%{component}/plugins/nicira/nvp.ini \ /etc/%{component}/metadata_agent.ini \ /etc/%{component}/metering_agent.ini \ /etc/%{component}/plugins/mlnx-agent.ini \ @@ -348,6 +366,9 @@ ln -s ../..%{_initddir}/openstack-%{component}-${agents[$i]} %{buildroot}%{_sbindir}/rcopenstack-%{component}-${agents[$i]} done +install -D -m 755 %{SOURCE6} %{buildroot}%{_initddir}/openstack-%{component}-ovs-cleanup +ln -s ../..%{_initddir}/openstack-%{component}-ovs-cleanup %{buildroot}%{_sbindir}/rcopenstack-%{component}-ovs-cleanup + ### sudoers configuration for nova-rootwrap: install -D -m 440 %{SOURCE3} %{buildroot}%{_sysconfdir}/sudoers.d/openstack-neutron @@ -357,12 +378,16 @@ ## SUSE configuration defaults crudini --set %{buildroot}/etc/neutron/neutron.conf DEFAULT verbose True -crudini --set %{buildroot}/etc/neutron/neutron.conf DEFAULT core_plugin neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2 +crudini --set %{buildroot}/etc/neutron/neutron.conf DEFAULT core_plugin neutron.plugins.ml2.plugin.Ml2Plugin +crudini --set %{buildroot}/etc/neutron/neutron.conf DEFAULT service_plugins neutron.services.l3_router.l3_router_plugin.L3RouterPlugin crudini --set %{buildroot}/etc/neutron/neutron.conf agent root_helper "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" crudini --set %{buildroot}/etc/neutron/neutron.conf DEFAULT log_dir /var/log/neutron crudini --set %{buildroot}/etc/neutron/dhcp_agent.ini DEFAULT interface_driver neutron.agent.linux.interface.BridgeInterfaceDriver crudini --set %{buildroot}/etc/neutron/l3_agent.ini DEFAULT external_network_bridge "br-ex" +crudini --set %{buildroot}/etc/neutron/l3_agent.ini DEFAULT external_network_bridge "" crudini --set %{buildroot}/etc/neutron/l3_agent.ini DEFAULT interface_driver neutron.agent.linux.interface.BridgeInterfaceDriver +crudini --set %{buildroot}/etc/neutron/plugins/ml2/ml2_conf.ini ml2 mechanism_drivers linuxbridge +crudini --set %{buildroot}/etc/neutron/plugins/ml2/ml2_conf.ini securitygroup firewall_driver neutron.agent.linux.iptables_firewall.IptablesFirewallDriver ### test subpackage %openstack_test_package_install @@ -416,6 +441,7 @@ %config(noreplace) %{_sysconfdir}/%{component}/api-paste.ini %config %{_sysconfdir}/%{component}/policy.json %config(noreplace) %attr(0640, root, %{groupname}) %{_sysconfdir}/%{component}/neutron.conf +%config(noreplace) %attr(0640, root, %{groupname}) %{_sysconfdir}/%{component}/fwaas_driver.ini %config %{_sysconfdir}/%{component}/rootwrap.conf %dir %{_sysconfdir}/%{component}/rootwrap.d/ %ghost %dir %attr(0755, %{username}, root) %{_localstatedir}/run/%{component} @@ -430,7 +456,6 @@ %dir %{_sysconfdir}/%{component}/plugins/midonet %dir %{_sysconfdir}/%{component}/plugins/ml2 %dir %{_sysconfdir}/%{component}/plugins/nec/ -%dir %{_sysconfdir}/%{component}/plugins/nicira/ %dir %{_sysconfdir}/%{component}/plugins/plumgrid/ %dir %{_sysconfdir}/%{component}/plugins/ryu/ %config(noreplace) %{_sysconfdir}/%{component}/plugins/bigswitch/restproxy.ini @@ -442,16 +467,14 @@ %config(noreplace) %{_sysconfdir}/%{component}/plugins/ml2/ml2_conf_arista.ini %config(noreplace) %{_sysconfdir}/%{component}/plugins/ml2/ml2_conf_cisco.ini %config(noreplace) %{_sysconfdir}/%{component}/plugins/nec/nec.ini -%config(noreplace) %{_sysconfdir}/%{component}/plugins/nicira/nvp.ini %config(noreplace) %{_sysconfdir}/%{component}/plugins/brocade/brocade.ini %config(noreplace) %{_sysconfdir}/%{component}/plugins/plumgrid/plumgrid.ini %config(noreplace) %{_sysconfdir}/%{component}/plugins/openvswitch/ovs_neutron_plugin.ini %config(noreplace) %{_sysconfdir}/%{component}/plugins/ryu/ryu.ini +%config %{_sysconfdir}/%{component}/rootwrap.d/debug.filters %config %{_sysconfdir}/%{component}/rootwrap.d/iptables-firewall.filters %{_bindir}/%{component}-debug %{_bindir}/quantum-debug -%{_bindir}/%{component}-check-nvp-config -%{_bindir}/quantum-check-nvp-config %{_bindir}/%{component}-netns-cleanup %{_bindir}/quantum-netns-cleanup %{_bindir}/%{component}-ns-metadata-proxy @@ -563,10 +586,22 @@ %{_bindir}/quantum-openvswitch-agent %{_bindir}/%{component}-ovs-cleanup %{_bindir}/quantum-ovs-cleanup +%{_initddir}/openstack-%{component}-ovs-cleanup +%{_sbindir}/rcopenstack-%{component}-ovs-cleanup %config %{_sysconfdir}/%{component}/rootwrap.d/openvswitch-plugin.filters %{_initddir}/openstack-%{component}-openvswitch-agent %{_sbindir}/rcopenstack-%{component}-openvswitch-agent +%files vmware-agent +%defattr(-,root,root,-) +%doc LICENSE +%dir %{_sysconfdir}/%{component}/plugins/nicira/ +%config(noreplace) %{_sysconfdir}/%{component}/plugins/nicira/nvp.ini +%{_initddir}/openstack-%{component}-vmware-agent +%{_sbindir}/rcopenstack-%{component}-vmware-agent +%{_bindir}/%{component}-check-nvp-config +%{_bindir}/quantum-check-nvp-config + %files vpn-agent %defattr(-,root,root,-) %doc LICENSE @@ -574,6 +609,7 @@ %{_bindir}/%{component}-vpn-agent %{_initddir}/openstack-%{component}-vpn-agent %{_sbindir}/rcopenstack-%{component}-vpn-agent +%config %{_sysconfdir}/%{component}/rootwrap.d/vpnaas.filters %files server %defattr(-,root,root,-) ++++++ 0001-Reassign-IP-to-vlan-interface-when-deleting-a-VLAN-b.patch ++++++ >From f73ee4859972ae50ea0156d14df5c3931493a524 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp <[email protected]> Date: Tue, 26 Nov 2013 17:38:44 +0100 Subject: [PATCH] Reassign IP to vlan interface when deleting a VLAN bridge When deleting a VLAN bridge that has an IP address assigned to it, don't delete the VLAN interface, but reassigned the IP address back to the underlying VLAN interface. Closes-Bug: #1255153 Change-Id: I5e39877c0786b43eddba9b5e1394d4c2ec023c0a (cherry picked from commit 7c16563e69ef9134729fe769627bbe5fe0de0695) --- .../linuxbridge/agent/linuxbridge_neutron_agent.py | 18 +++++---- .../unit/linuxbridge/test_lb_neutron_agent.py | 44 ++++++++++++++++++++-- 2 files changed, 50 insertions(+), 12 deletions(-) diff --git a/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py b/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py index ee6e0b5..1d67df2 100755 --- a/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py +++ b/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py @@ -426,15 +426,17 @@ class LinuxBridgeManager: continue for physical_interface in self.interface_mappings.itervalues(): - if physical_interface == interface: - # This is a flat network => return IP's from bridge to - # interface + if (interface.startswith(physical_interface)): ips, gateway = self.get_interface_details(bridge_name) - self.update_interface_ip_details(interface, - bridge_name, - ips, gateway) - elif interface.startswith(physical_interface): - self.delete_vlan(interface) + if ips: + # This is a flat network or a VLAN interface that + # was setup outside of neutron => return IP's from + # bridge to interface + self.update_interface_ip_details(interface, + bridge_name, + ips, gateway) + elif physical_interface != interface: + self.delete_vlan(interface) LOG.debug(_("Deleting bridge %s"), bridge_name) if utils.execute(['ip', 'link', 'set', bridge_name, 'down'], diff --git a/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py b/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py index ba76786..fb6aeca 100644 --- a/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py +++ b/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py @@ -512,24 +512,60 @@ class TestLinuxBridgeManager(base.BaseTestCase): mock.patch.object(self.lbm, "remove_interface"), mock.patch.object(self.lbm, "get_interface_details"), mock.patch.object(self.lbm, "update_interface_ip_details"), - mock.patch.object(self.lbm, "delete_vlan"), mock.patch.object(self.lbm, "delete_vxlan"), mock.patch.object(utils, "execute") ) as (de_fn, getif_fn, remif_fn, if_det_fn, - updif_fn, del_vlan, del_vxlan, exec_fn): + updif_fn, del_vxlan, exec_fn): de_fn.return_value = False self.lbm.delete_vlan_bridge("br0") self.assertFalse(getif_fn.called) de_fn.return_value = True - getif_fn.return_value = ["eth0", "eth1.1", "eth1", "vxlan-1002"] + getif_fn.return_value = ["eth0", "eth1", "vxlan-1002"] if_det_fn.return_value = ("ips", "gateway") exec_fn.return_value = False self.lbm.delete_vlan_bridge("br0") updif_fn.assert_called_with("eth1", "br0", "ips", "gateway") - del_vlan.assert_called_with("eth1.1") del_vxlan.assert_called_with("vxlan-1002") + def test_delete_vlan_bridge_with_ip(self): + with contextlib.nested( + mock.patch.object(self.lbm, "device_exists"), + mock.patch.object(self.lbm, "get_interfaces_on_bridge"), + mock.patch.object(self.lbm, "remove_interface"), + mock.patch.object(self.lbm, "get_interface_details"), + mock.patch.object(self.lbm, "update_interface_ip_details"), + mock.patch.object(self.lbm, "delete_vlan"), + mock.patch.object(utils, "execute") + ) as (de_fn, getif_fn, remif_fn, if_det_fn, + updif_fn, del_vlan, exec_fn): + de_fn.return_value = True + getif_fn.return_value = ["eth0", "eth1.1"] + if_det_fn.return_value = ("ips", "gateway") + exec_fn.return_value = False + self.lbm.delete_vlan_bridge("br0") + updif_fn.assert_called_with("eth1.1", "br0", "ips", "gateway") + self.assertFalse(del_vlan.called) + + def test_delete_vlan_bridge_no_ip(self): + with contextlib.nested( + mock.patch.object(self.lbm, "device_exists"), + mock.patch.object(self.lbm, "get_interfaces_on_bridge"), + mock.patch.object(self.lbm, "remove_interface"), + mock.patch.object(self.lbm, "get_interface_details"), + mock.patch.object(self.lbm, "update_interface_ip_details"), + mock.patch.object(self.lbm, "delete_vlan"), + mock.patch.object(utils, "execute") + ) as (de_fn, getif_fn, remif_fn, if_det_fn, + updif_fn, del_vlan, exec_fn): + de_fn.return_value = True + getif_fn.return_value = ["eth0", "eth1.1"] + exec_fn.return_value = False + if_det_fn.return_value = ([], None) + self.lbm.delete_vlan_bridge("br0") + del_vlan.assert_called_with("eth1.1") + self.assertFalse(updif_fn.called) + def test_delete_vxlan_bridge_no_int_mappings(self): interface_mappings = {} lbm = linuxbridge_neutron_agent.LinuxBridgeManager( -- 1.8.4 ++++++ neutron-stable-havana.tar.gz ++++++ ++++ 3103 lines of diff (skipped) ++++++ openstack-neutron-ovs-cleanup.init ++++++ #! /bin/sh ### BEGIN INIT INFO # Provides: neutron-ovs-cleanup # Required-Start: $remote_fs $syslog openvswitch-switch # Required-Stop: $remote_fs $syslog openvswitch-switch # Should-Start: mysql postgresql rabbitmq-server # Should-Stop: mysql postgresql rabbitmq-server # Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: neutron-ovs-cleanup # Description: Clean up integration bridges in OVS before starting Neutron ### END INIT INFO NEUTRON_LOGFILE="/var/log/neutron/ovs-cleanup.log" USER="openstack-neutron" DAEMON=/usr/bin/neutron-ovs-cleanup DAEMON_ARGS="--config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini" DAEMON_DIR=/var/run export TMPDIR=/var/lib/neutron/tmp if [ ! -x ${DAEMON} ] ; then exit 0 fi . /etc/rc.status case "$1" in start) echo -n "Performing Cleanup of OpenVSwitch bridges for Neutron" su $USER -s /bin/sh -c "/usr/bin/neutron-ovs-cleanup $DAEMON_ARGS" rc_status -v ;; stop) ;; restart|force-reload) ;; reload) ;; status) true rc_status -v ;; *) echo $"Usage: $0 {start|stop|restart|force-reload|status}" exit 2 ;; esac exit $? ++++++ openstack-neutron-plugin.init ++++++ --- /var/tmp/diff_new_pack.9Ii9mc/_old 2014-01-23 15:50:41.000000000 +0100 +++ /var/tmp/diff_new_pack.9Ii9mc/_new 2014-01-23 15:50:41.000000000 +0100 @@ -3,8 +3,8 @@ # Provides: openstack-neutron-__NAME__ # Required-Start: $remote_fs $syslog # Required-Stop: $remote_fs $syslog -# Should-Start: mysql postgresql rabbitmq-server -# Should-Stop: mysql postgresql rabbitmq-server +# Should-Start: mysql postgresql rabbitmq-server neutron-ovs-cleanup +# Should-Stop: mysql postgresql rabbitmq-server neutron-ovs-cleanup # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: OpenStack Compute (Quantum) - __NAME__ @@ -19,7 +19,7 @@ NEUTRON_PLUGIN_ARGS="" if [ ! -z $NEUTRON_PLUGIN_CONF ] && [ $NEUTRON_PLUGIN_CONF != "" ] ; then - PLUGIN_ARGS="$NEUTRON_PLUGIN_ARGS --config-file=$NEUTRON_PLUGIN_CONF" + PLUGIN_ARGS="$NEUTRON_PLUGIN_ARGS --config-file $NEUTRON_PLUGIN_CONF" fi @@ -31,7 +31,7 @@ case "$1" in start) echo -n "Starting neutron-$DAEMON" - /sbin/startproc -q -s -u $USER /usr/bin/neutron-$DAEMON --config-file=$CONFFILE $PLUGIN_ARGS + /sbin/startproc -q -s -u $USER /usr/bin/neutron-$DAEMON --config-file $CONFFILE $PLUGIN_ARGS rc_status -v ;; stop) ++++++ openstack-neutron.init ++++++ --- /var/tmp/diff_new_pack.9Ii9mc/_old 2014-01-23 15:50:41.000000000 +0100 +++ /var/tmp/diff_new_pack.9Ii9mc/_new 2014-01-23 15:50:41.000000000 +0100 @@ -3,6 +3,8 @@ # Provides: neutron-server # Required-Start: $remote_fs $syslog # Required-Stop: $remote_fs $syslog +# Should-Start: mysql postgresql rabbitmq-server +# Should-Stop: mysql postgresql rabbitmq-server # Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: neutron-server @@ -14,9 +16,13 @@ test -r $NEUTRON_SYSCONFIG || exit 6 . $NEUTRON_SYSCONFIG +CONF_ARGS="--config-file /etc/neutron/neutron.conf" +for i in $NEUTRON_PLUGIN_CONF; do + CONF_ARGS="$CONF_ARGS --config-file $i" +done USER="openstack-neutron" DAEMON=/usr/bin/neutron-server -DAEMON_ARGS="--log-file=$NEUTRON_LOGFILE --config-file=/etc/neutron/neutron.conf --config-file=$NEUTRON_PLUGIN_CONF" +DAEMON_ARGS="--log-file $NEUTRON_LOGFILE $CONF_ARGS" DAEMON_DIR=/var/run export TMPDIR=/var/lib/neutron/tmp @@ -30,7 +36,7 @@ case "$1" in start) echo -n "Checking for DB Migrations" - /usr/bin/neutron-db-manage check_migration + /usr/bin/neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file $NEUTRON_PLUGIN_CONF check_migration rc_status -v echo -n "Starting neutron server" ++++++ sysconfig.neutron ++++++ --- /var/tmp/diff_new_pack.9Ii9mc/_old 2014-01-23 15:50:41.000000000 +0100 +++ /var/tmp/diff_new_pack.9Ii9mc/_new 2014-01-23 15:50:41.000000000 +0100 @@ -1,5 +1,5 @@ ## Type: string # -# location of the plugin configuration file +# location of addtional plugin configuration files (space-separated) -NEUTRON_PLUGIN_CONF="/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini" +NEUTRON_PLUGIN_CONF="/etc/neutron/plugins/ml2/ml2_conf.ini" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
