Merge "Replace abc.abstractproperty with property and abc.abstractmethod"

5 files changed, 34 insertions, 17 deletions

diff --git a/ceilometer/network/statistics/__init__.py b/ceilometer/network/statistics/__init__.py
index b427b889..3ef8af01 100644
--- a/ceilometer/network/statistics/__init__.py
+++ b/ceilometer/network/statistics/__init__.py
@@ -35,15 +35,18 @@ class _Base(plugin_base.PollsterBase, metaclass=abc.ABCMeta):
         # pipeline configuration
         return None
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def meter_name(self):
         """Return a Meter Name."""
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def meter_type(self):
         """Return a Meter Type."""
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def meter_unit(self):
         """Return a Meter Unit."""
 
diff --git a/ceilometer/network/statistics/opendaylight/client.py b/ceilometer/network/statistics/opendaylight/client.py
index da14be2f..ad46fd1c 100644
--- a/ceilometer/network/statistics/opendaylight/client.py
+++ b/ceilometer/network/statistics/opendaylight/client.py
@@ -27,7 +27,8 @@ LOG = log.getLogger(__name__)
 class _Base(object, metaclass=abc.ABCMeta):
     """Base class of OpenDaylight REST APIs Clients."""
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def base_url(self):
         """Returns base url for each REST API."""
 
diff --git a/ceilometer/pipeline/base.py b/ceilometer/pipeline/base.py
index 56100add..2473e487 100644
--- a/ceilometer/pipeline/base.py
+++ b/ceilometer/pipeline/base.py
@@ -275,19 +275,23 @@ class PipelineManager(agent.ConfigManagerBase):
                     self.pipelines.append(pipe)
         unique_names.clear()
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def pm_type(self):
         """Pipeline manager type."""
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def pm_pipeline(self):
         """Pipeline class"""
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def pm_source(self):
         """Pipeline source class"""
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def pm_sink(self):
         """Pipeline sink class"""
 
diff --git a/ceilometer/polling/plugin_base.py b/ceilometer/polling/plugin_base.py
index be275614..e75a35a6 100644
--- a/ceilometer/polling/plugin_base.py
+++ b/ceilometer/polling/plugin_base.py
@@ -63,7 +63,8 @@ class PollsterBase(object, metaclass=abc.ABCMeta):
         except Exception as err:
             raise ExtensionLoadError(err)
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def default_discovery(self):
         """Default discovery to use for this pollster.
 
diff --git a/ceilometer/tests/unit/network/statistics/opendaylight/test_driver.py b/ceilometer/tests/unit/network/statistics/opendaylight/test_driver.py
index ae95c4b8..b40d5a0c 100644
--- a/ceilometer/tests/unit/network/statistics/opendaylight/test_driver.py
+++ b/ceilometer/tests/unit/network/statistics/opendaylight/test_driver.py
@@ -24,35 +24,43 @@ from ceilometer import service
 
 class _Base(base.BaseTestCase, metaclass=abc.ABCMeta):
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def flow_data(self):
         pass
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def port_data(self):
         pass
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def table_data(self):
         pass
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def topology_data(self):
         pass
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def switch_data(self):
         pass
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def user_links_data(self):
         pass
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def active_hosts_data(self):
         pass
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def inactive_hosts_data(self):
         pass