Merge "Remove "abc.abstractproperty""

neutron/agent/linux/dhcp.py

@@ -178,7 +178,8 @@ class DhcpBase(object, metaclass=abc.ABCMeta):
         self.disable(retain_port=True, block=True)
         self.enable()
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def active(self):
         """Boolean representing the running state of the DHCP server."""
 

neutron/agent/linux/external_process.py

@@ -37,7 +37,8 @@ agent_cfg.register_process_monitor_opts(cfg.CONF)
 
 
 class MonitoredProcess(object, metaclass=abc.ABCMeta):
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def active(self):
         """Boolean representing the running state of the process."""
 

neutron/db/rbac_db_models.py

@@ -51,7 +51,8 @@ class RBACColumns(model_base.HasId, model_base.HasProject):
 
     action = sa.Column(sa.String(255), nullable=False)
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def object_type(self):
         # this determines the name that users will use in the API
         # to reference the type. sub-classes should set their own

neutron/services/trunk/drivers/base.py

@@ -43,7 +43,8 @@ class DriverBase(object):
         self.agent_type = agent_type
         self.can_trunk_bound_port = can_trunk_bound_port
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def is_loaded(self):
         """True if the driver is active for the Neutron Server.