]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Fixed local diff with upstream.
authorThomas Goirand <thomas@goirand.fr>
Fri, 31 Jul 2015 21:42:25 +0000 (21:42 +0000)
committerThomas Goirand <thomas@goirand.fr>
Fri, 31 Jul 2015 21:47:03 +0000 (21:47 +0000)
neutron/agent/l3/ha.py
neutron/tests/functional/agent/linux/helpers.py
neutron/tests/functional/agent/test_l3_agent.py
neutron/tests/functional/agent/test_ovs_flows.py
neutron/tests/unit/agent/l3/test_agent.py
neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py

index cbbd8fd7622b0d27e882e2eb5623b10287e2878c..76363c9afba7ff092f79e04017596fa0f6584b6b 100644 (file)
@@ -145,14 +145,6 @@ class AgentMixin(object):
         else:
             ri.disable_radvd()
 
-    def _update_radvd_daemon(self, ri, state):
-        # Radvd has to be spawned only on the Master HA Router. If there are
-        # any state transitions, we enable/disable radvd accordingly.
-        if state == 'master':
-            ri.enable_radvd()
-        else:
-            ri.disable_radvd()
-
     def notify_server(self, batched_events):
         translation_map = {'master': 'active',
                            'backup': 'standby',
index 6eb5516725732a49f7807e3fe094a00e2e18fe2d..9980293aa75ce65cbf0509060adbe21340acffab 100644 (file)
@@ -15,7 +15,6 @@
 import os
 
 import fixtures
-import netaddr
 
 
 class RecursivePermDirFixture(fixtures.Fixture):
index 3a68fcafa3b00ad01d3216bdd7132a90f0edc8ad..ef2bd498ed8bb750d3b97b4c9416e410d139742a 100644 (file)
@@ -881,79 +881,6 @@ class L3HATestFramework(L3AgentTestFramework):
         # Verify that keepalived config is properly updated.
         verify_ip_in_keepalived_config(router, internal_iface)
 
-    def test_ha_router_ipv6_radvd_status(self):
-        router_info = self.generate_router_info(ip_version=6, enable_ha=True)
-        router1 = self.manage_router(self.agent, router_info)
-        utils.wait_until_true(lambda: router1.ha_state == 'master')
-        utils.wait_until_true(lambda: router1.radvd.enabled)
-
-        def _check_lla_status(router, expected):
-            internal_devices = router.router[l3_constants.INTERFACE_KEY]
-            for device in internal_devices:
-                lladdr = ip_lib.get_ipv6_lladdr(device['mac_address'])
-                exists = ip_lib.device_exists_with_ips_and_mac(
-                    router.get_internal_device_name(device['id']), [lladdr],
-                    device['mac_address'], router.ns_name)
-                self.assertEqual(expected, exists)
-
-        _check_lla_status(router1, True)
-
-        device_name = router1.get_ha_device_name()
-        ha_device = ip_lib.IPDevice(device_name, namespace=router1.ns_name)
-        ha_device.link.set_down()
-
-        utils.wait_until_true(lambda: router1.ha_state == 'backup')
-        utils.wait_until_true(lambda: not router1.radvd.enabled, timeout=10)
-        _check_lla_status(router1, False)
-
-    def test_ha_router_process_ipv6_subnets_to_existing_port(self):
-        router_info = self.generate_router_info(enable_ha=True, ip_version=6)
-        router = self.manage_router(self.agent, router_info)
-
-        def verify_ip_in_keepalived_config(router, iface):
-            config = router.keepalived_manager.config.get_config_str()
-            ip_cidrs = common_utils.fixed_ip_cidrs(iface['fixed_ips'])
-            for ip_addr in ip_cidrs:
-                self.assertIn(ip_addr, config)
-
-        interface_id = router.router[l3_constants.INTERFACE_KEY][0]['id']
-        slaac = l3_constants.IPV6_SLAAC
-        slaac_mode = {'ra_mode': slaac, 'address_mode': slaac}
-
-        # Add a second IPv6 subnet to the router internal interface.
-        self._add_internal_interface_by_subnet(router.router, count=1,
-                ip_version=6, ipv6_subnet_modes=[slaac_mode],
-                interface_id=interface_id)
-        router.process(self.agent)
-        utils.wait_until_true(lambda: router.ha_state == 'master')
-
-        # Verify that router internal interface is present and is configured
-        # with IP address from both the subnets.
-        internal_iface = router.router[l3_constants.INTERFACE_KEY][0]
-        self.assertEqual(2, len(internal_iface['fixed_ips']))
-        self._assert_internal_devices(router)
-
-        # Verify that keepalived config is properly updated.
-        verify_ip_in_keepalived_config(router, internal_iface)
-
-        # Remove one subnet from the router internal iface
-        interfaces = copy.deepcopy(router.router.get(
-            l3_constants.INTERFACE_KEY, []))
-        fixed_ips, subnets = [], []
-        fixed_ips.append(interfaces[0]['fixed_ips'][0])
-        subnets.append(interfaces[0]['subnets'][0])
-        interfaces[0].update({'fixed_ips': fixed_ips, 'subnets': subnets})
-        router.router[l3_constants.INTERFACE_KEY] = interfaces
-        router.process(self.agent)
-
-        # Verify that router internal interface has a single ipaddress
-        internal_iface = router.router[l3_constants.INTERFACE_KEY][0]
-        self.assertEqual(1, len(internal_iface['fixed_ips']))
-        self._assert_internal_devices(router)
-
-        # Verify that keepalived config is properly updated.
-        verify_ip_in_keepalived_config(router, internal_iface)
-
 
 class MetadataFakeProxyHandler(object):
 
index 7f583cd7c79198038e0acb8f247a9455e97b8aed..5d73ea1a5f309f20a8237dfc78147468a1a248e2 100644 (file)
@@ -131,17 +131,6 @@ class _ARPSpoofTestCase(object):
         self.dst_p.addr.wait_until_address_ready(self.dst_addr)
         net_helpers.assert_ping(self.src_namespace, self.dst_addr, count=2)
 
-    def test_arp_spoof_doesnt_block_ipv6(self):
-        self.src_addr = '2000::1'
-        self.dst_addr = '2000::2'
-        self._setup_arp_spoof_for_port(self.src_p.name, [self.src_addr])
-        self._setup_arp_spoof_for_port(self.dst_p.name, [self.dst_addr])
-        self.src_p.addr.add('%s/64' % self.src_addr)
-        self.dst_p.addr.add('%s/64' % self.dst_addr)
-        # IPv6 addresses seem to take longer to initialize
-        pinger = helpers.Pinger(self.src_ns, max_attempts=4)
-        pinger.assert_ping(self.dst_addr)
-
     def test_arp_spoof_blocks_response(self):
         # this will prevent the destination from responding to the ARP
         # request for it's own address
@@ -165,21 +154,6 @@ class _ARPSpoofTestCase(object):
         except RuntimeError:
             pass
 
-    def test_arp_spoof_blocks_request(self):
-        # this will prevent the source from sending an ARP
-        # request with its own address
-        self._setup_arp_spoof_for_port(self.src_p.name, ['192.168.0.3'])
-        self.src_p.addr.add('%s/24' % self.src_addr)
-        self.dst_p.addr.add('%s/24' % self.dst_addr)
-        ns_ip_wrapper = ip_lib.IPWrapper(self.src_ns)
-        try:
-            ns_ip_wrapper.netns.execute(['arping', '-I', self.src_p.name,
-                                         '-c1', self.dst_addr])
-            tools.fail("arping should have failed. The arp request should "
-                       "have been blocked.")
-        except RuntimeError:
-            pass
-
     def test_arp_spoof_allowed_address_pairs(self):
         self._setup_arp_spoof_for_port(self.dst_p.name, ['192.168.0.3',
                                                          self.dst_addr])
index 803d90b94e66c16197f3dc26d62fa9e8993fd3db..b59c9cc632db933507571868b78cc575890946b9 100644 (file)
@@ -944,7 +944,6 @@ class TestBasicRouterOperations(BasicRouterOperationsFramework):
             {'id': _uuid(),
              'floating_ip_address': '20.0.0.3',
              'fixed_ip_address': '192.168.0.1',
-             'status': 'DOWN',
              'floating_network_id': _uuid(),
              'port_id': _uuid(),
              'host': HOSTNAME}]}
index 953194849950bf4ce6de646f7e3a73809db1e048..9aaa3132f190a314344eabe77899ee5216bc4b7f 100644 (file)
@@ -1041,14 +1041,6 @@ class TestOvsNeutronAgent(object):
         self._test_ovs_status(constants.OVS_NORMAL,
                               constants.OVS_RESTARTED)
 
-    def test_ovs_status(self):
-        self._test_ovs_status(constants.OVS_NORMAL,
-                              constants.OVS_DEAD,
-                              constants.OVS_RESTARTED)
-        # OVS will not DEAD in some exception, like DBConnectionError.
-        self._test_ovs_status(constants.OVS_NORMAL,
-                              constants.OVS_RESTARTED)
-
     def test_set_rpc_timeout(self):
         self.agent._handle_sigterm(None, None)
         for rpc_client in (self.agent.plugin_rpc.client,