From 1e571d311d1f1fe4439980251737c27a580a0fbe Mon Sep 17 00:00:00 2001
From: ljhuang <huang.liujie@99cloud.net>
Date: Wed, 3 Aug 2022 16:39:04 +0800
Subject: [PATCH] Replace abc.abstractproperty with property and
 abc.abstractmethod

Replace abc.abstractproperty with property and abc.abstractmethod,
as abc.abstractproperty has been deprecated since python3.3[1]

[1]https://docs.python.org/3.8/whatsnew/3.3.html?highlight=deprecated#abc

Change-Id: Id7b94d3f3c852ba85255ca0b08d2dfc275006bab
---
 magnum/conductor/monitors.py        | 3 ++-
 magnum/drivers/common/driver.py     | 3 ++-
 magnum/drivers/heat/template_def.py | 9 ++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/magnum/conductor/monitors.py b/magnum/conductor/monitors.py
index 35eebbed85..6e4c73e816 100644
--- a/magnum/conductor/monitors.py
+++ b/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."""
 
diff --git a/magnum/drivers/common/driver.py b/magnum/drivers/common/driver.py
index f21f4333b5..d4c8dbed8a 100644
--- a/magnum/drivers/common/driver.py
+++ b/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
 
diff --git a/magnum/drivers/heat/template_def.py b/magnum/drivers/heat/template_def.py
index f3aa594ecb..da5e7625ec 100644
--- a/magnum/drivers/heat/template_def.py
+++ b/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