Get rid of py26 references: OrderedDict, httplib, xml testing

Change-Id: I44315e0663a7c0c82110b933b68e2b747f548859

diff --git a/neutron/plugins/bigswitch/servermanager.py b/neutron/plugins/bigswitch/servermanager.py
index 3fb008be057502f803546b5efca1a1487d258d89..6d473e3977fda4b0fc07356cba824fe9e32cb6e8 100644 (file)
--- a/neutron/plugins/bigswitch/servermanager.py
+++ b/neutron/plugins/bigswitch/servermanager.py
@@ -637,13 +637,8 @@ class HTTPSConnectionWithValidation(httplib.HTTPSConnection):
     combined_cert = None
 
     def connect(self):
-        try:
-            sock = socket.create_connection((self.host, self.port),
-                                            self.timeout, self.source_address)
-        except AttributeError:
-            # python 2.6 doesn't have the source_address attribute
-            sock = socket.create_connection((self.host, self.port),
-                                            self.timeout)
+        sock = socket.create_connection((self.host, self.port),
+                                        self.timeout, self.source_address)
         if self._tunnel_host:
             self.sock = sock
             self._tunnel()

diff --git a/neutron/tests/base.py b/neutron/tests/base.py
index a55068c066eb1e3fda27adce2c609d29aa7a191b..420c8ed9d5f46f1646c50c38857a44ca1180b99d 100644 (file)
--- a/neutron/tests/base.py
+++ b/neutron/tests/base.py
@@ -25,7 +25,6 @@ errors due to duplicate configuration definitions.
 
 import logging as std_logging
 import os.path
-import sys
 
 import fixtures
 import mock
@@ -97,10 +96,6 @@ class BaseTestCase(sub_base.SubBaseTestCase):
             fake_use_fatal_exceptions))
 
         self.setup_rpc_mocks()
-
-        if sys.version_info < (2, 7) and getattr(self, 'fmt', '') == 'xml':
-            raise self.skipException('XML Testing Skipped in Py26')
-
         self.setup_config()
 
     def setup_rpc_mocks(self):

diff --git a/neutron/tests/unit/agent/linux/test_ovs_lib.py b/neutron/tests/unit/agent/linux/test_ovs_lib.py
index 3d2611e2e894bbf382b65f1bb92d8b0dcefc7ce0..0176364ab916c7898f0e0b824cf1d9686b115a5f 100644 (file)
--- a/neutron/tests/unit/agent/linux/test_ovs_lib.py
+++ b/neutron/tests/unit/agent/linux/test_ovs_lib.py
@@ -26,11 +26,6 @@ from neutron.plugins.common import constants
 from neutron.tests import base
 from neutron.tests import tools
 
-try:
-    OrderedDict = collections.OrderedDict
-except AttributeError:
-    import ordereddict
-    OrderedDict = ordereddict.OrderedDict
 
 OVS_LINUX_KERN_VERS_WITHOUT_VXLAN = "3.12.0"
 
@@ -244,26 +239,30 @@ class OVS_Lib_Test(base.BaseTestCase):
         lsw_id = 18
         cidr = '192.168.1.0/24'
 
-        flow_dict_1 = OrderedDict([('priority', 2),
-                                   ('dl_src', 'ca:fe:de:ad:be:ef'),
-                                   ('actions', 'strip_vlan,output:0')])
-        flow_dict_2 = OrderedDict([('priority', 1),
-                                   ('actions', 'normal')])
-        flow_dict_3 = OrderedDict([('priority', 2),
-                                   ('actions', 'drop')])
-        flow_dict_4 = OrderedDict([('priority', 2),
-                                   ('in_port', ofport),
-                                   ('actions', 'drop')])
-        flow_dict_5 = OrderedDict([
+        flow_dict_1 = collections.OrderedDict([
+            ('priority', 2),
+            ('dl_src', 'ca:fe:de:ad:be:ef'),
+            ('actions', 'strip_vlan,output:0')])
+        flow_dict_2 = collections.OrderedDict([
+            ('priority', 1),
+            ('actions', 'normal')])
+        flow_dict_3 = collections.OrderedDict([
+            ('priority', 2),
+            ('actions', 'drop')])
+        flow_dict_4 = collections.OrderedDict([
+            ('priority', 2),
+            ('in_port', ofport),
+            ('actions', 'drop')])
+        flow_dict_5 = collections.OrderedDict([
             ('priority', 4),
             ('in_port', ofport),
             ('dl_vlan', vid),
             ('actions', "strip_vlan,set_tunnel:%s,normal" % (lsw_id))])
-        flow_dict_6 = OrderedDict([
+        flow_dict_6 = collections.OrderedDict([
             ('priority', 3),
             ('tun_id', lsw_id),
             ('actions', "mod_vlan_vid:%s,output:%s" % (vid, ofport))])
-        flow_dict_7 = OrderedDict([
+        flow_dict_7 = collections.OrderedDict([
             ('priority', 4),
             ('nw_src', cidr),
             ('proto', 'arp'),
@@ -320,10 +319,11 @@ class OVS_Lib_Test(base.BaseTestCase):
         self.execute.assert_has_calls(expected_calls)
 
     def test_add_flow_timeout_set(self):
-        flow_dict = OrderedDict([('priority', 1),
-                                 ('hard_timeout', 1000),
-                                 ('idle_timeout', 2000),
-                                 ('actions', 'normal')])
+        flow_dict = collections.OrderedDict([
+            ('priority', 1),
+            ('hard_timeout', 1000),
+            ('idle_timeout', 2000),
+            ('actions', 'normal')])
 
         self.br.add_flow(**flow_dict)
         self.execute.assert_called_once_with(
@@ -333,7 +333,7 @@ class OVS_Lib_Test(base.BaseTestCase):
             root_helper=self.root_helper)
 
     def test_add_flow_default_priority(self):
-        flow_dict = OrderedDict([('actions', 'normal')])
+        flow_dict = collections.OrderedDict([('actions', 'normal')])
 
         self.br.add_flow(**flow_dict)
         self.execute.assert_called_once_with(

diff --git a/neutron/tests/unit/bigswitch/test_servermanager.py b/neutron/tests/unit/bigswitch/test_servermanager.py
index ffb7ee991b590b4ccdcda13720629c237dbfc8db..51de12ef74ff3975c5f54af36cf7f45d873fd755 100644 (file)
--- a/neutron/tests/unit/bigswitch/test_servermanager.py
+++ b/neutron/tests/unit/bigswitch/test_servermanager.py
@@ -512,9 +512,6 @@ class ServerManagerTests(test_rp.BigSwitchProxyPluginV2TestCase):
         con = self.sm.HTTPSConnectionWithValidation(
             'www.example.org', 443, timeout=90)
         con.source_address = '127.0.0.1'
-        if not hasattr(con, 'set_tunnel'):
-            # no tunnel support in py26
-            return
         con.set_tunnel('myproxy.local', 3128)
         con.request("GET", "/")
         self.socket_mock.assert_has_calls([mock.call(

diff --git a/neutron/tests/unit/test_security_groups_rpc.py b/neutron/tests/unit/test_security_groups_rpc.py
index fb141486ce20c3aa0d8af74255ffb5e508048c95..742bb3257f9fff187bc3b351f869ffbefad53412 100644 (file)
--- a/neutron/tests/unit/test_security_groups_rpc.py
+++ b/neutron/tests/unit/test_security_groups_rpc.py
@@ -39,12 +39,6 @@ from neutron import manager
 from neutron.tests import base
 from neutron.tests.unit import test_extension_security_group as test_sg
 
-try:
-    OrderedDict = collections.OrderedDict
-except AttributeError:
-    import ordereddict
-    OrderedDict = ordereddict.OrderedDict
-
 FAKE_PREFIX = {const.IPv4: '10.0.0.0/24',
                const.IPv6: '2001:db8::/64'}
 FAKE_IP = {const.IPv4: '10.0.0.1',
@@ -1210,10 +1204,9 @@ class SecurityGroupAgentEnhancedRpcTestCase(
         super(SecurityGroupAgentEnhancedRpcTestCase, self).setUp(
             defer_refresh_firewall=defer_refresh_firewall)
         fake_sg_info = {
-            'security_groups':
-                OrderedDict([
-                    ('fake_sgid2', []),
-                    ('fake_sgid1', [{'remote_group_id': 'fake_sgid2'}])]),
+            'security_groups': collections.OrderedDict([
+                ('fake_sgid2', []),
+                ('fake_sgid1', [{'remote_group_id': 'fake_sgid2'}])]),
             'sg_member_ips': {'fake_sgid2': {'IPv4': [], 'IPv6': []}},
             'devices': self.firewall.ports}
         self.agent.plugin_rpc.security_group_info_for_devices.return_value = (

diff --git a/test-requirements.txt b/test-requirements.txt
index 42d78abb9bf87841d52efdbcb6645a9d1b1e3d63..cb11b2addab588093e9140586dc10c7f3f163aae 100644 (file)
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,7 +9,6 @@ discover
 fixtures>=0.3.14
 mock>=1.0
 python-subunit>=0.0.18
-ordereddict
 requests-mock>=0.5.1  # Apache-2.0
 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
 oslosphinx>=2.2.0  # Apache-2.0