Remove is_ha property from the router

This was a todo left over from refactoring.  The one place where it
was used was in the metadata driver which can just as easily check
isinstance.

The is_ha property in the HA class only returned True if self.router
was True.  The agent sets this on creation and so it will always be
True.  Additionally, it didn't really make sense to me anyway given
the way this was being used in the metadata driver.

Change-Id: Idf91ee5f8b72ff9a1740dd60090327d07ee8e16e

diff --git a/neutron/agent/l3/ha_router.py b/neutron/agent/l3/ha_router.py
index cf079a5086e6a4f979685f8cccc7f502f6face0b..b041da3899c764632f68700cd8738094934d4507 100644 (file)
--- a/neutron/agent/l3/ha_router.py
+++ b/neutron/agent/l3/ha_router.py
@@ -39,11 +39,6 @@ class HaRouter(router.RouterInfo):
         self.keepalived_manager = None
         self.state_change_callback = state_change_callback
 
-    @property
-    def is_ha(self):
-        # TODO(Carl) Remove when refactoring to use sub-classes is complete.
-        return self.router is not None
-
     @property
     def ha_priority(self):
         return self.router.get('priority', keepalived.HA_DEFAULT_PRIORITY)

diff --git a/neutron/agent/l3/router_info.py b/neutron/agent/l3/router_info.py
index 15699211caaf185c65c6a9a8021481572500b1d0..8ac21b38f8f316e962b441cf47a48b244e38925b 100644 (file)
--- a/neutron/agent/l3/router_info.py
+++ b/neutron/agent/l3/router_info.py
@@ -96,11 +96,6 @@ class RouterInfo(object):
         # enable_snat by default if it wasn't specified by plugin
         self._snat_enabled = self._router.get('enable_snat', True)
 
-    @property
-    def is_ha(self):
-        # TODO(Carl) Refactoring should render this obsolete.  Remove it.
-        return False
-
     def get_internal_device_name(self, port_id):
         return (INTERNAL_DEV_PREFIX + port_id)[:self.driver.DEV_NAME_LEN]
 

diff --git a/neutron/agent/metadata/driver.py b/neutron/agent/metadata/driver.py
index e7b291c29e756779b0b82a5e5c6aecbd64fb5b81..16002d2c2393f06648fd691c21a273f9b01a7102 100644 (file)
--- a/neutron/agent/metadata/driver.py
+++ b/neutron/agent/metadata/driver.py
@@ -18,6 +18,7 @@ import os
 from oslo_log import log as logging
 
 from neutron.agent.common import config
+from neutron.agent.l3 import ha_router
 from neutron.agent.l3 import namespaces
 from neutron.agent.linux import external_process
 from neutron.agent.linux import utils
@@ -154,7 +155,7 @@ def after_router_added(resource, event, l3_agent, **kwargs):
         router.iptables_manager.ipv4['nat'].add_rule(c, r)
     router.iptables_manager.apply()
 
-    if not router.is_ha:
+    if not isinstance(router, ha_router.HaRouter):
         proxy.spawn_monitored_metadata_proxy(
             l3_agent.process_monitor,
             router.ns_name,