Merge "Replace deprecated abc.abstractproperty"

watcher/applier/actions/base.py

@@ -118,7 +118,8 @@ class BaseAction(loadable.Loadable, metaclass=abc.ABCMeta):
         """
         raise NotImplementedError()
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def schema(self):
         """Defines a Schema that the input parameters shall comply to
 

watcher/common/service_manager.py

@@ -19,30 +19,37 @@ import abc
 
 class ServiceManager(object, metaclass=abc.ABCMeta):
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def service_name(self):
         raise NotImplementedError()
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def api_version(self):
         raise NotImplementedError()
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def publisher_id(self):
         raise NotImplementedError()
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def conductor_topic(self):
         raise NotImplementedError()
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def notification_topics(self):
         raise NotImplementedError()
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def conductor_endpoints(self):
         raise NotImplementedError()
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def notification_endpoints(self):
         raise NotImplementedError()

watcher/decision_engine/goal/efficacy/indicators.py

@@ -36,7 +36,8 @@ class IndicatorSpecification(object, metaclass=abc.ABCMeta):
         self.unit = unit
         self.required = required
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def schema(self):
         """JsonSchema used to validate the indicator value
 

watcher/decision_engine/model/collector/base.py

@@ -147,7 +147,8 @@ class BaseClusterDataModelCollector(loadable.LoadableSingleton,
         self._cluster_data_model = model
         self.lock.release()
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def notification_endpoints(self):
         """Associated notification endpoints
 

watcher/decision_engine/model/notification/base.py

@@ -26,7 +26,8 @@ class NotificationEndpoint(object, metaclass=abc.ABCMeta):
         self.collector = collector
         self._notifier = None
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def filter_rule(self):
         """Notification Filter"""
         raise NotImplementedError()

watcher/decision_engine/solution/base.py

@@ -114,6 +114,7 @@ class BaseSolution(object, metaclass=abc.ABCMeta):
         """
         raise NotImplementedError()
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def actions(self):
         raise NotImplementedError()