Hello community, here is the log from the commit of package openstack-neutron for openSUSE:Factory checked in at 2013-07-17 09:30:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-07-10 17:29:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openstack-neutron.new/openstack-neutron.changes 2013-07-17 09:30:25.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Jul 10 00:14:46 UTC 2013 - [email protected] + +- Update to version 2013.2.a914.gd80048e: + + validate and recommend the cidr + + Fix for Cisco plugin sample config. + + Allow router route update in XML. + + git remove old non-working packaging files + + Ensure that the neutron server is properly monkey patched + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-neutron-doc.spec ++++++ --- /var/tmp/diff_new_pack.eik03N/_old 2013-07-17 09:30:26.000000000 +0200 +++ /var/tmp/diff_new_pack.eik03N/_new 2013-07-17 09:30:26.000000000 +0200 @@ -19,7 +19,7 @@ %define component neutron Name: openstack-neutron-doc -Version: 2013.2.a905.g5434abb +Version: 2013.2.a914.gd80048e Release: 0 Summary: OpenStack Virtual Network Service (Quantum) - Documentation License: Apache-2.0 @@ -59,7 +59,7 @@ This package contains documentation files for openstack-%{component} %prep -%setup -q -n neutron-2013.2.a905.g5434abb +%setup -q -n neutron-2013.2.a914.gd80048e %openstack_cleanup_prep %build ++++++ openstack-neutron.spec ++++++ --- /var/tmp/diff_new_pack.eik03N/_old 2013-07-17 09:30:26.000000000 +0200 +++ /var/tmp/diff_new_pack.eik03N/_new 2013-07-17 09:30:26.000000000 +0200 @@ -21,7 +21,7 @@ %define username openstack-%{component} Name: openstack-neutron -Version: 2013.2.a905.g5434abb +Version: 2013.2.a914.gd80048e Release: 0 Summary: OpenStack Network License: Apache-2.0 @@ -263,7 +263,7 @@ of OpenStack Neutron. %prep -%setup -q -n neutron-2013.2.a905.g5434abb +%setup -q -n neutron-2013.2.a914.gd80048e ## comment me in # %xopenstack_cleanup_prep %patch2 ++++++ neutron-master.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/neutron-2013.2.a905.g5434abb/.bzrignore new/neutron-2013.2.a914.gd80048e/.bzrignore --- old/neutron-2013.2.a905.g5434abb/.bzrignore 2013-07-09 09:30:19.000000000 +0200 +++ new/neutron-2013.2.a914.gd80048e/.bzrignore 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -*.pyc -quantum.egg-info -quantum_tests.sqlite -quantum.sqlite -*.quantum-venv -neutron.egg-info -neutron_tests.sqlite -neutron.sqlite -*.neutron-venv -.venv -dist/ -ChangeLog -*.pid -*.log -neutron/vcsversion.py -quantum/vcsversion.py -.ropeproject diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/neutron-2013.2.a905.g5434abb/AUTHORS new/neutron-2013.2.a914.gd80048e/AUTHORS --- old/neutron-2013.2.a905.g5434abb/AUTHORS 2013-07-09 09:31:56.000000000 +0200 +++ new/neutron-2013.2.a914.gd80048e/AUTHORS 2013-07-09 23:05:19.000000000 +0200 @@ -16,6 +16,7 @@ Ben Nemec <[email protected]> Bhuvan Arumugam <[email protected]> Bob Kukura <[email protected]> +Bob Melander <[email protected]> Brad Hall <[email protected]> Brad Hall <[email protected]> Brian Haley <[email protected]> @@ -71,6 +72,7 @@ ivan-zhu <[email protected]> James E. Blair <[email protected]> James E. Blair <[email protected]> +Jason Dillaman <[email protected]> Jason Kölker <[email protected]> Jason Zhang <[email protected]> Jay S. Bryant <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/neutron-2013.2.a905.g5434abb/ChangeLog new/neutron-2013.2.a914.gd80048e/ChangeLog --- old/neutron-2013.2.a905.g5434abb/ChangeLog 2013-07-09 09:31:56.000000000 +0200 +++ new/neutron-2013.2.a914.gd80048e/ChangeLog 2013-07-09 23:05:19.000000000 +0200 @@ -1,3 +1,58 @@ +commit d80048eefc4c076c241d747ea63cb885382f04f0 +Merge: 28bcd6a 34b8ee5 +Author: Jenkins <[email protected]> +Date: Tue Jul 9 21:03:07 2013 +0000 + + Merge "Ensure that the neutron server is properly monkey patched" + +commit 28bcd6a5321300c097351856d49c97c12a5a80a9 +Merge: aa64633 e094041 +Author: Jenkins <[email protected]> +Date: Tue Jul 9 20:24:47 2013 +0000 + + Merge "git remove old non-working packaging files" + +commit aa6463375935977579661a1624c3edc8b296a1e3 +Merge: c4d423e 758666d +Author: Jenkins <[email protected]> +Date: Tue Jul 9 19:30:43 2013 +0000 + + Merge "Allow router route update in XML." + +commit 34b8ee5d5985d05b8e7cfa3f4500c11030814b7d +Author: Jason Dillaman <[email protected]> +Date: Tue Jul 9 10:22:05 2013 -0400 + + Ensure that the neutron server is properly monkey patched + + The legacy 'quantum-server' script will apply the eventlet + monkey patch whereas the new 'neutron-server' entry point + does not. This prevents the server from properly handling + the REST interface. + + Fixes bug #1199383 + + Change-Id: I498d2b02e6018425fc4538eff6803df8971f8e82 + +commit c4d423ef6132609d27752ce03f0a68182f31716d +Author: Arvind Somya <[email protected]> +Date: Mon Jul 8 17:38:02 2013 -0400 + + Fix for Cisco plugin sample config. + + This commit fixes the Cisco plugin's sample config included with Neutron to change all instances + of quantum within the config to neutron. + + Change-Id: I80a8b69816ad964ee9761a214aaa5e81e596d501 + Fixes: Bug #1199160 + +commit a3d0a4450aa868187b71ecd7bdd39f7dad0034de +Merge: 5434abb 53a66b2 +Author: Jenkins <[email protected]> +Date: Tue Jul 9 13:01:38 2013 +0000 + + Merge "validate and recommend the cidr" + commit 5434abbd4cafce18d1fc075d928800200937053c Merge: 77add2c 361f52a Author: OpenStack Jenkins <[email protected]> @@ -12,6 +67,21 @@ Merge "Divide dhcp and l3 agent scheduling into separate extensions" +commit 758666d89ce675e503aebda671f54961b6f2b489 +Author: Bob Melander <[email protected]> +Date: Fri Jul 5 15:53:49 2013 +0200 + + Allow router route update in XML. + + Fixes: bug 1198188 + + Router updates of routes in XML format fails. + This patch fixes that problem. It also executes + unit tests for XML-based requests to update + router routes. + + Change-Id: Ie65e889a29a3ca9242593d51587de60c8d97e055 + commit 361f52a8d50214d20927011c99eb259e19870abb Author: OpenStack Jenkins <[email protected]> Date: Mon Jul 8 19:56:06 2013 +0000 @@ -69,6 +139,16 @@ Change-Id: Ic21d8c8f6c68f9f31f76ed0bd50b86312ec6f6b4 +commit e094041d1537d91353d636a00fbfd210077484c6 +Author: Mark McClain <[email protected]> +Date: Sun Jul 7 22:15:30 2013 -0400 + + git remove old non-working packaging files + + implements bug: 1198774 + + Change-Id: Iebd3eb22dd7e3b93131c298e01ac4bcf1fea004e + commit 5be773909974f958b7591d2be00b968e70f0b600 Author: OpenStack Jenkins <[email protected]> Date: Sun Jul 7 19:55:55 2013 +0000 @@ -77,6 +157,20 @@ Change-Id: I2b07b67cc0afbc7aef69e26d64874775e0faf612 +commit 53a66b299f18a7184972502b43441a5ad7b050fd +Author: Yong Sheng Gong <[email protected]> +Date: Sun Jul 7 21:20:36 2013 +0800 + + validate and recommend the cidr + + Bug #1195974 + + It is hard to validate the CIDR typed in by user, + the simple way is to recognize only one and recommend it + if user's input is not the one. + + Change-Id: Ic8defe30a43a5ae69c3f737094f866b36bb68f59 + commit 31c7bdac68e7ebf1c2e7d91efa155b7212c20388 Author: Dirk Mueller <[email protected]> Date: Sun Jul 7 13:44:48 2013 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/neutron-2013.2.a905.g5434abb/PKG-INFO new/neutron-2013.2.a914.gd80048e/PKG-INFO --- old/neutron-2013.2.a905.g5434abb/PKG-INFO 2013-07-09 09:32:00.000000000 +0200 +++ new/neutron-2013.2.a914.gd80048e/PKG-INFO 2013-07-09 23:05:23.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: neutron -Version: 2013.2.a905.g5434abb +Version: 2013.2.a914.gd80048e Summary: OpenStack Networking Home-page: http://www.openstack.org/ Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/neutron-2013.2.a905.g5434abb/etc/neutron/plugins/cisco/cisco_plugins.ini new/neutron-2013.2.a914.gd80048e/etc/neutron/plugins/cisco/cisco_plugins.ini --- old/neutron-2013.2.a905.g5434abb/etc/neutron/plugins/cisco/cisco_plugins.ini 2013-07-09 09:30:19.000000000 +0200 +++ new/neutron-2013.2.a914.gd80048e/etc/neutron/plugins/cisco/cisco_plugins.ini 2013-07-09 23:03:38.000000000 +0200 @@ -1,6 +1,6 @@ [cisco_plugins] -#nexus_plugin=quantum.plugins.cisco.nexus.cisco_nexus_plugin_v2.NexusPlugin -#vswitch_plugin=quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2 +#nexus_plugin=neutron.plugins.cisco.nexus.cisco_nexus_plugin_v2.NexusPlugin +#vswitch_plugin=neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2 [cisco] #vlan_start=100 @@ -9,9 +9,9 @@ #max_ports=100 #max_port_profiles=65568 #max_networks=65568 -#model_class=quantum.plugins.cisco.models.virt_phy_sw_v2.VirtualPhysicalSwitchModelV2 -#manager_class=quantum.plugins.cisco.segmentation.l2network_vlan_mgr_v2.L2NetworkVLANMgr -#nexus_driver=quantum.plugins.cisco.test.nexus.fake_nexus_driver.CiscoNEXUSFakeDriver +#model_class=neutron.plugins.cisco.models.virt_phy_sw_v2.VirtualPhysicalSwitchModelV2 +#manager_class=neutron.plugins.cisco.segmentation.l2network_vlan_mgr_v2.L2NetworkVLANMgr +#nexus_driver=neutron.plugins.cisco.test.nexus.fake_nexus_driver.CiscoNEXUSFakeDriver #svi_round_robin=False # IMPORTANT: Comment out the following two lines for production deployments diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/neutron-2013.2.a905.g5434abb/etc/quantum/plugins/cisco/cisco_plugins.ini new/neutron-2013.2.a914.gd80048e/etc/quantum/plugins/cisco/cisco_plugins.ini --- old/neutron-2013.2.a905.g5434abb/etc/quantum/plugins/cisco/cisco_plugins.ini 2013-07-09 09:30:19.000000000 +0200 +++ new/neutron-2013.2.a914.gd80048e/etc/quantum/plugins/cisco/cisco_plugins.ini 2013-07-09 23:03:38.000000000 +0200 @@ -1,6 +1,6 @@ [cisco_plugins] -#nexus_plugin=quantum.plugins.cisco.nexus.cisco_nexus_plugin_v2.NexusPlugin -#vswitch_plugin=quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2 +#nexus_plugin=neutron.plugins.cisco.nexus.cisco_nexus_plugin_v2.NexusPlugin +#vswitch_plugin=neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2 [cisco] #vlan_start=100 @@ -9,9 +9,9 @@ #max_ports=100 #max_port_profiles=65568 #max_networks=65568 -#model_class=quantum.plugins.cisco.models.virt_phy_sw_v2.VirtualPhysicalSwitchModelV2 -#manager_class=quantum.plugins.cisco.segmentation.l2network_vlan_mgr_v2.L2NetworkVLANMgr -#nexus_driver=quantum.plugins.cisco.test.nexus.fake_nexus_driver.CiscoNEXUSFakeDriver +#model_class=neutron.plugins.cisco.models.virt_phy_sw_v2.VirtualPhysicalSwitchModelV2 +#manager_class=neutron.plugins.cisco.segmentation.l2network_vlan_mgr_v2.L2NetworkVLANMgr +#nexus_driver=neutron.plugins.cisco.test.nexus.fake_nexus_driver.CiscoNEXUSFakeDriver #svi_round_robin=False # IMPORTANT: Comment out the following two lines for production deployments diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/neutron-2013.2.a905.g5434abb/neutron/api/v2/attributes.py new/neutron-2013.2.a914.gd80048e/neutron/api/v2/attributes.py --- old/neutron-2013.2.a905.g5434abb/neutron/api/v2/attributes.py 2013-07-09 09:30:19.000000000 +0200 +++ new/neutron-2013.2.a914.gd80048e/neutron/api/v2/attributes.py 2013-07-09 23:03:38.000000000 +0200 @@ -244,15 +244,20 @@ def _validate_subnet(data, valid_values=None): + msg = None try: - netaddr.IPNetwork(_validate_no_whitespace(data)) - if len(data.split('/')) == 2: + net = netaddr.IPNetwork(_validate_no_whitespace(data)) + cidr = str(net.cidr) + if (cidr != data): + msg = _("'%(data)s' isn't a recognized IP subnet cidr," + " '%(cidr)s' is recommended") % {"data": data, + "cidr": cidr} + else: return except Exception: - pass - - msg = _("'%s' is not a valid IP subnet") % data - LOG.debug(msg) + msg = _("'%s' is not a valid IP subnet") % data + if msg: + LOG.debug(msg) return msg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/neutron-2013.2.a905.g5434abb/neutron/extensions/extraroute.py new/neutron-2013.2.a914.gd80048e/neutron/extensions/extraroute.py --- old/neutron-2013.2.a905.g5434abb/neutron/extensions/extraroute.py 2013-07-09 09:30:19.000000000 +0200 +++ new/neutron-2013.2.a914.gd80048e/neutron/extensions/extraroute.py 2013-07-09 23:03:38.000000000 +0200 @@ -69,6 +69,7 @@ def get_extended_resources(self, version): if version == "2.0": + attr.PLURALS.update({'routes': 'route'}) return EXTENDED_ATTRIBUTES_2_0 else: return {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/neutron-2013.2.a905.g5434abb/neutron/server/__init__.py new/neutron-2013.2.a914.gd80048e/neutron/server/__init__.py --- old/neutron-2013.2.a905.g5434abb/neutron/server/__init__.py 2013-07-09 09:30:19.000000000 +0200 +++ new/neutron-2013.2.a914.gd80048e/neutron/server/__init__.py 2013-07-09 23:03:38.000000000 +0200 @@ -19,6 +19,7 @@ # If ../neutron/__init__.py exists, add ../ to Python search path, so that # it will override what happens to be installed in /usr/(local/)lib/python... +import eventlet import sys from oslo.config import cfg @@ -28,6 +29,8 @@ def main(): + eventlet.monkey_patch() + # the configuration will be read into the cfg.CONF global data structure config.parse(sys.argv[1:]) if not cfg.CONF.config_file: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/neutron-2013.2.a905.g5434abb/neutron/tests/unit/test_attributes.py new/neutron-2013.2.a914.gd80048e/neutron/tests/unit/test_attributes.py --- old/neutron-2013.2.a905.g5434abb/neutron/tests/unit/test_attributes.py 2013-07-09 09:30:19.000000000 +0200 +++ new/neutron-2013.2.a914.gd80048e/neutron/tests/unit/test_attributes.py 2013-07-09 23:03:39.000000000 +0200 @@ -266,7 +266,7 @@ [{'nexthop': '10.0.2.20', 'destination': '100.0.0.0/8'}, {'nexthop': '10.0.2.20', - 'destination': '100.0.0.1/8'}]] + 'destination': '101.0.0.0/8'}]] for host_routes in hostroute_pools: msg = attributes._validate_hostroutes(host_routes, None) self.assertIsNone(msg) @@ -371,7 +371,7 @@ self.assertIsNone(msg) # Valid - IPv6 with final octets - cidr = "fe80::0/24" + cidr = "fe80::/24" msg = attributes._validate_subnet(cidr, None) self.assertIsNone(msg) @@ -380,21 +380,36 @@ cidr = "10.0.2.0" msg = attributes._validate_subnet(cidr, None) - error = "'%s' is not a valid IP subnet" % cidr + error = _("'%(data)s' isn't a recognized IP subnet cidr," + " '%(cidr)s' is recommended") % {"data": cidr, + "cidr": "10.0.2.0/32"} + self.assertEqual(msg, error) + + # Invalid - IPv4 with final octets + cidr = "192.168.1.1/24" + msg = attributes._validate_subnet(cidr, + None) + error = _("'%(data)s' isn't a recognized IP subnet cidr," + " '%(cidr)s' is recommended") % {"data": cidr, + "cidr": "192.168.1.0/24"} self.assertEqual(msg, error) # Invalid - IPv6 without final octets, missing mask cidr = "fe80::" msg = attributes._validate_subnet(cidr, None) - error = "'%s' is not a valid IP subnet" % cidr + error = _("'%(data)s' isn't a recognized IP subnet cidr," + " '%(cidr)s' is recommended") % {"data": cidr, + "cidr": "fe80::/128"} self.assertEqual(msg, error) # Invalid - IPv6 with final octets, missing mask cidr = "fe80::0" msg = attributes._validate_subnet(cidr, None) - error = "'%s' is not a valid IP subnet" % cidr + error = _("'%(data)s' isn't a recognized IP subnet cidr," + " '%(cidr)s' is recommended") % {"data": cidr, + "cidr": "fe80::/128"} self.assertEqual(msg, error) # Invalid - Address format error diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/neutron-2013.2.a905.g5434abb/neutron/tests/unit/test_db_plugin.py new/neutron-2013.2.a914.gd80048e/neutron/tests/unit/test_db_plugin.py --- old/neutron-2013.2.a905.g5434abb/neutron/tests/unit/test_db_plugin.py 2013-07-09 09:30:19.000000000 +0200 +++ new/neutron-2013.2.a914.gd80048e/neutron/tests/unit/test_db_plugin.py 2013-07-09 23:03:39.000000000 +0200 @@ -1347,7 +1347,7 @@ res = self._create_subnet(self.fmt, tenant_id=tenant_id, net_id=net_id, - cidr='2607:f0d0:1002:51::0/124', + cidr='2607:f0d0:1002:51::/124', ip_version=6, gateway_ip=ATTR_NOT_SPECIFIED) subnet2 = self.deserialize(self.fmt, res) @@ -1543,26 +1543,6 @@ res = self._create_port(self.fmt, net_id=net_id, **kwargs) self.assertEqual(res.status_int, 400) - def test_fixed_ip_valid_ip_non_root_cidr(self): - with self.subnet(cidr='10.0.0.254/24') as subnet: - # Allocate specific IP - kwargs = {"fixed_ips": [{'subnet_id': subnet['subnet']['id'], - 'ip_address': '10.0.0.2'}]} - net_id = subnet['subnet']['network_id'] - res = self._create_port(self.fmt, net_id=net_id, **kwargs) - self.assertEqual(res.status_int, 201) - port = self.deserialize(self.fmt, res) - self._delete('ports', port['port']['id']) - - def test_fixed_ip_invalid_ip_non_root_cidr(self): - with self.subnet(cidr='10.0.0.254/24') as subnet: - # Allocate specific IP - kwargs = {"fixed_ips": [{'subnet_id': subnet['subnet']['id'], - 'ip_address': '10.0.1.2'}]} - net_id = subnet['subnet']['network_id'] - res = self._create_port(self.fmt, net_id=net_id, **kwargs) - self.assertEqual(res.status_int, 400) - def test_requested_ips_only(self): with self.subnet() as subnet: with self.port(subnet=subnet) as port: @@ -2555,6 +2535,17 @@ res = subnet_req.get_response(self.api) self.assertEqual(res.status_int, 403) + def test_create_subnet_bad_cidr(self): + with self.network() as network: + data = {'subnet': {'network_id': network['network']['id'], + 'cidr': '10.0.2.5/24', + 'ip_version': 4, + 'tenant_id': network['network']['tenant_id']}} + + subnet_req = self.new_create_request('subnets', data) + res = subnet_req.get_response(self.api) + self.assertEqual(res.status_int, webob.exc.HTTPBadRequest.code) + def test_create_subnet_bad_ip_version(self): with self.network() as network: # Check bad IP version @@ -2800,7 +2791,7 @@ def test_create_subnet_with_v6_allocation_pool(self): gateway_ip = 'fe80::1' - cidr = 'fe80::0/80' + cidr = 'fe80::/80' allocation_pools = [{'start': 'fe80::2', 'end': 'fe80::ffff:fffa:ffff'}] self._test_create_subnet(gateway_ip=gateway_ip, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/neutron-2013.2.a905.g5434abb/neutron/tests/unit/test_extension_extraroute.py new/neutron-2013.2.a914.gd80048e/neutron/tests/unit/test_extension_extraroute.py --- old/neutron-2013.2.a905.g5434abb/neutron/tests/unit/test_extension_extraroute.py 2013-07-09 09:30:19.000000000 +0200 +++ new/neutron-2013.2.a914.gd80048e/neutron/tests/unit/test_extension_extraroute.py 2013-07-09 23:03:39.000000000 +0200 @@ -475,3 +475,7 @@ (router1, router2, router3), ('name', 'asc'), 2, 2) + + +class ExtraRouteDBTestCaseXML(ExtraRouteDBTestCase): + fmt = 'xml' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/neutron-2013.2.a905.g5434abb/neutron/tests/unit/test_iptables_firewall.py new/neutron-2013.2.a914.gd80048e/neutron/tests/unit/test_iptables_firewall.py --- old/neutron-2013.2.a905.g5434abb/neutron/tests/unit/test_iptables_firewall.py 2013-07-09 09:30:19.000000000 +0200 +++ new/neutron-2013.2.a914.gd80048e/neutron/tests/unit/test_iptables_firewall.py 2013-07-09 23:03:39.000000000 +0200 @@ -27,7 +27,7 @@ _uuid = test_api_v2._uuid FAKE_PREFIX = {'IPv4': '10.0.0.0/24', - 'IPv6': 'fe80::0/48'} + 'IPv6': 'fe80::/48'} FAKE_IP = {'IPv4': '10.0.0.1', 'IPv6': 'fe80::1'} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/neutron-2013.2.a905.g5434abb/neutron/tests/unit/test_l3_plugin.py new/neutron-2013.2.a914.gd80048e/neutron/tests/unit/test_l3_plugin.py --- old/neutron-2013.2.a905.g5434abb/neutron/tests/unit/test_l3_plugin.py 2013-07-09 09:30:19.000000000 +0200 +++ new/neutron-2013.2.a914.gd80048e/neutron/tests/unit/test_l3_plugin.py 2013-07-09 23:03:39.000000000 +0200 @@ -1149,7 +1149,7 @@ expected_code=exc.HTTPNotFound.code) def _test_floatingip_with_assoc_fails(self, plugin_class): - with self.subnet(cidr='200.0.0.1/24') as public_sub: + with self.subnet(cidr='200.0.0.0/24') as public_sub: self._set_net_external(public_sub['subnet']['network_id']) with self.port() as private_port: with self.router() as r: @@ -1187,7 +1187,7 @@ 'neutron.db.l3_db.L3_NAT_db_mixin') def _test_floatingip_with_ip_generation_failure(self, plugin_class): - with self.subnet(cidr='200.0.0.1/24') as public_sub: + with self.subnet(cidr='200.0.0.0/24') as public_sub: self._set_net_external(public_sub['subnet']['network_id']) with self.port() as private_port: with self.router() as r: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/neutron-2013.2.a905.g5434abb/neutron.egg-info/PKG-INFO new/neutron-2013.2.a914.gd80048e/neutron.egg-info/PKG-INFO --- old/neutron-2013.2.a905.g5434abb/neutron.egg-info/PKG-INFO 2013-07-09 09:31:56.000000000 +0200 +++ new/neutron-2013.2.a914.gd80048e/neutron.egg-info/PKG-INFO 2013-07-09 23:05:19.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: neutron -Version: 2013.2.a905.g5434abb +Version: 2013.2.a914.gd80048e Summary: OpenStack Networking Home-page: http://www.openstack.org/ Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/neutron-2013.2.a905.g5434abb/neutron.egg-info/SOURCES.txt new/neutron-2013.2.a914.gd80048e/neutron.egg-info/SOURCES.txt --- old/neutron-2013.2.a905.g5434abb/neutron.egg-info/SOURCES.txt 2013-07-09 09:32:00.000000000 +0200 +++ new/neutron-2013.2.a914.gd80048e/neutron.egg-info/SOURCES.txt 2013-07-09 23:05:23.000000000 +0200 @@ -1,4 +1,3 @@ -.bzrignore .coveragerc .mailmap .pylintrc @@ -855,7 +854,6 @@ quantum/__init__.py quantum/auth.py quantum/api/__init__.py -tools/build_debs.sh tools/check_i18n.py tools/check_i18n_test_case.txt tools/clean.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/neutron-2013.2.a905.g5434abb/tools/build_debs.sh new/neutron-2013.2.a914.gd80048e/tools/build_debs.sh --- old/neutron-2013.2.a905.g5434abb/tools/build_debs.sh 2013-07-09 09:30:19.000000000 +0200 +++ new/neutron-2013.2.a914.gd80048e/tools/build_debs.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -#!/bin/bash -ALIEN=`which alien` -if [ $? -ne 0 ]; then - echo "You must have alien installed to build debian packages" - exit 1 -fi -FAKEROOT="" -if [ `id -u` != 0 ]; then - FAKEROOT=`which fakeroot` - if [ $? -ne 0 ]; then - echo "You must be root or have fakeroot installed to build debian packages" - exit 1 - fi -fi - -ls dist/*.rpm >/dev/null 2>&1 -if [ $? -ne 0 ]; then - echo "You must build rpms before building debian packages" - exit 1 -fi - -$FAKEROOT $ALIEN -c -v -d dist/*.noarch.rpm -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
