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

magnum/conductor/monitors.py

@@ -34,7 +34,8 @@ class MonitorBase(object, metaclass=abc.ABCMeta):
         self.context = context
         self.cluster = cluster
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def metrics_spec(self):
         """Metric specification."""
 

magnum/drivers/common/driver.py

@@ -174,7 +174,8 @@ class Driver(object, metaclass=abc.ABCMeta):
         """
         return
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def provides(self):
         """return a list of (server_type, os, coe) tuples
 

magnum/drivers/heat/template_def.py

@@ -320,11 +320,13 @@ class TemplateDefinition(object, metaclass=abc.ABCMeta):
         for output in self.nodegroup_output_mappings:
             output.set_output(stack, cluster_template, cluster)
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def driver_module_path(self):
         pass
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def template_path(self):
         pass
 
@@ -357,7 +359,8 @@ class BaseTemplateDefinition(TemplateDefinition):
     def driver_module_path(self):
         pass
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def template_path(self):
         pass