mirror of
https://github.com/JoelBender/bacpypes
synced 2025-09-28 22:15:23 +08:00
merge (#92)
This commit is contained in:
Joel Bender
parent
1849dde77c
commit
882031e963
|
|
@ -8,7 +8,7 @@ from ..debugging import bacpypes_debugging, DebugContents, ModuleLogger
|
||||||
from ..capability import Capability
|
from ..capability import Capability
|
||||||
|
|
||||||
from ..core import deferred
|
from ..core import deferred
|
||||||
from ..task import OneShotTask, TaskManager
|
from ..task import OneShotTask, RecurringFunctionTask, TaskManager
|
||||||
from ..iocb import IOCB
|
from ..iocb import IOCB
|
||||||
|
|
||||||
from ..basetypes import DeviceAddress, COVSubscription, PropertyValue, \
|
from ..basetypes import DeviceAddress, COVSubscription, PropertyValue, \
|
||||||
|
|
@ -167,6 +167,23 @@ class COVDetection(DetectionAlgorithm):
|
||||||
# list of all active subscriptions
|
# list of all active subscriptions
|
||||||
self.cov_subscriptions = SubscriptionList()
|
self.cov_subscriptions = SubscriptionList()
|
||||||
|
|
||||||
|
def add_subscription(self, cov):
|
||||||
|
if _debug: COVDetection._debug("add_subscription %r", cov)
|
||||||
|
|
||||||
|
# add it to the subscription list for its object
|
||||||
|
self.cov_subscriptions.append(cov)
|
||||||
|
|
||||||
|
def cancel_subscription(self, cov):
|
||||||
|
if _debug: COVDetection._debug("cancel_subscription %r", cov)
|
||||||
|
|
||||||
|
# cancel the subscription timeout
|
||||||
|
if cov.isScheduled:
|
||||||
|
cov.suspend_task()
|
||||||
|
if _debug: COVDetection._debug(" - task suspended")
|
||||||
|
|
||||||
|
# remove it from the subscription list for its object
|
||||||
|
self.cov_subscriptions.remove(cov)
|
||||||
|
|
||||||
def execute(self):
|
def execute(self):
|
||||||
if _debug: COVDetection._debug("execute")
|
if _debug: COVDetection._debug("execute")
|
||||||
|
|
||||||
|
|
@ -297,14 +314,14 @@ class COVIncrementCriteria(COVDetection):
|
||||||
self.previous_reported_value = old_value
|
self.previous_reported_value = old_value
|
||||||
|
|
||||||
# see if it changed enough to trigger reporting
|
# see if it changed enough to trigger reporting
|
||||||
value_changed = (new_value <= (self.previous_reported_value - self.covIncrement)) \
|
value_changed = (new_value <= (self.previous_reported_value - self.obj.covIncrement)) \
|
||||||
or (new_value >= (self.previous_reported_value + self.covIncrement))
|
or (new_value >= (self.previous_reported_value + self.obj.covIncrement))
|
||||||
if _debug: COVIncrementCriteria._debug(" - value significantly changed: %r", value_changed)
|
if _debug: COVIncrementCriteria._debug(" - value significantly changed: %r", value_changed)
|
||||||
|
|
||||||
return value_changed
|
return value_changed
|
||||||
|
|
||||||
def send_cov_notifications(self, subscription=None):
|
def send_cov_notifications(self, subscription=None):
|
||||||
if _debug: COVIncrementCriteria._debug("send_cov_notifications")
|
if _debug: COVIncrementCriteria._debug("send_cov_notifications %r", subscription)
|
||||||
|
|
||||||
# when sending out notifications, keep the current value
|
# when sending out notifications, keep the current value
|
||||||
self.previous_reported_value = self.presentValue
|
self.previous_reported_value = self.presentValue
|
||||||
|
|
@ -379,17 +396,82 @@ class LoadControlCriteria(COVDetection):
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class PulseConverterCriteria(COVDetection):
|
class PulseConverterCriteria(COVIncrementCriteria):
|
||||||
|
|
||||||
properties_tracked = (
|
properties_tracked = (
|
||||||
'presentValue',
|
'presentValue',
|
||||||
'statusFlags',
|
'statusFlags',
|
||||||
|
'covPeriod',
|
||||||
)
|
)
|
||||||
properties_reported = (
|
properties_reported = (
|
||||||
'presentValue',
|
'presentValue',
|
||||||
'statusFlags',
|
'statusFlags',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def __init__(self, obj):
|
||||||
|
if _debug: PulseConverterCriteria._debug("__init__ %r", obj)
|
||||||
|
COVIncrementCriteria.__init__(self, obj)
|
||||||
|
|
||||||
|
# check for a period
|
||||||
|
if self.covPeriod == 0:
|
||||||
|
if _debug: PulseConverterCriteria._debug(" - no periodic notifications")
|
||||||
|
self.cov_period_task = None
|
||||||
|
else:
|
||||||
|
if _debug: PulseConverterCriteria._debug(" - covPeriod: %r", self.covPeriod)
|
||||||
|
self.cov_period_task = RecurringFunctionTask(self.covPeriod * 1000, self.send_cov_notifications)
|
||||||
|
if _debug: PulseConverterCriteria._debug(" - cov period task created")
|
||||||
|
|
||||||
|
def add_subscription(self, cov):
|
||||||
|
if _debug: PulseConverterCriteria._debug("add_subscription %r", cov)
|
||||||
|
|
||||||
|
# let the parent classes do their thing
|
||||||
|
COVIncrementCriteria.add_subscription(self, cov)
|
||||||
|
|
||||||
|
# if there is a COV period task, install it
|
||||||
|
if self.cov_period_task:
|
||||||
|
self.cov_period_task.install_task()
|
||||||
|
if _debug: PulseConverterCriteria._debug(" - cov period task installed")
|
||||||
|
|
||||||
|
def cancel_subscription(self, cov):
|
||||||
|
if _debug: PulseConverterCriteria._debug("cancel_subscription %r", cov)
|
||||||
|
|
||||||
|
# let the parent classes do their thing
|
||||||
|
COVIncrementCriteria.cancel_subscription(self, cov)
|
||||||
|
|
||||||
|
# if there are no more subscriptions, cancel the task
|
||||||
|
if not len(self.cov_subscriptions):
|
||||||
|
if self.cov_period_task and self.cov_period_task.isScheduled:
|
||||||
|
self.cov_period_task.suspend_task()
|
||||||
|
if _debug: PulseConverterCriteria._debug(" - cov period task suspended")
|
||||||
|
self.cov_period_task = None
|
||||||
|
|
||||||
|
@monitor_filter('covPeriod')
|
||||||
|
def cov_period_filter(self, old_value, new_value):
|
||||||
|
if _debug: PulseConverterCriteria._debug("cov_period_filter %r %r", old_value, new_value)
|
||||||
|
|
||||||
|
# check for an old period
|
||||||
|
if old_value != 0:
|
||||||
|
if self.cov_period_task.isScheduled:
|
||||||
|
self.cov_period_task.suspend_task()
|
||||||
|
if _debug: PulseConverterCriteria._debug(" - canceled old task")
|
||||||
|
self.cov_period_task = None
|
||||||
|
|
||||||
|
# check for a new period
|
||||||
|
if new_value != 0:
|
||||||
|
self.cov_period_task = RecurringFunctionTask(new_value * 1000, self.cov_period_x)
|
||||||
|
self.cov_period_task.install_task()
|
||||||
|
if _debug: PulseConverterCriteria._debug(" - new task created and installed")
|
||||||
|
|
||||||
|
return False
|
||||||
|
|
||||||
|
def send_cov_notifications(self, subscription=None):
|
||||||
|
if _debug: PulseConverterCriteria._debug("send_cov_notifications %r", subscription)
|
||||||
|
|
||||||
|
# pass along to the parent class as if something changed
|
||||||
|
COVIncrementCriteria.send_cov_notifications(self, subscription)
|
||||||
|
|
||||||
|
bacpypes_debugging(PulseConverterCriteria)
|
||||||
|
|
||||||
|
|
||||||
# mapping from object type to appropriate criteria class
|
# mapping from object type to appropriate criteria class
|
||||||
criteria_type_map = {
|
criteria_type_map = {
|
||||||
|
|
@ -516,22 +598,17 @@ class ChangeOfValueServices(Capability):
|
||||||
def add_subscription(self, cov):
|
def add_subscription(self, cov):
|
||||||
if _debug: ChangeOfValueServices._debug("add_subscription %r", cov)
|
if _debug: ChangeOfValueServices._debug("add_subscription %r", cov)
|
||||||
|
|
||||||
# add it to the subscription list for its object
|
# let the detection algorithm know this is a new or additional subscription
|
||||||
self.cov_detections[cov.obj_ref].cov_subscriptions.append(cov)
|
self.cov_detections[cov.obj_ref].add_subscription(cov)
|
||||||
|
|
||||||
def cancel_subscription(self, cov):
|
def cancel_subscription(self, cov):
|
||||||
if _debug: ChangeOfValueServices._debug("cancel_subscription %r", cov)
|
if _debug: ChangeOfValueServices._debug("cancel_subscription %r", cov)
|
||||||
|
|
||||||
# cancel the subscription timeout
|
|
||||||
if cov.isScheduled:
|
|
||||||
cov.suspend_task()
|
|
||||||
if _debug: ChangeOfValueServices._debug(" - task suspended")
|
|
||||||
|
|
||||||
# get the detection algorithm object
|
# get the detection algorithm object
|
||||||
cov_detection = self.cov_detections[cov.obj_ref]
|
cov_detection = self.cov_detections[cov.obj_ref]
|
||||||
|
|
||||||
# remove it from the subscription list for its object
|
# let the detection algorithm know this subscription is going away
|
||||||
cov_detection.cov_subscriptions.remove(cov)
|
cov_detection.cancel_subscription(cov)
|
||||||
|
|
||||||
# if the detection algorithm doesn't have any subscriptions, remove it
|
# if the detection algorithm doesn't have any subscriptions, remove it
|
||||||
if not len(cov_detection.cov_subscriptions):
|
if not len(cov_detection.cov_subscriptions):
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ from ..debugging import bacpypes_debugging, DebugContents, ModuleLogger
|
||||||
from ..capability import Capability
|
from ..capability import Capability
|
||||||
|
|
||||||
from ..core import deferred
|
from ..core import deferred
|
||||||
from ..task import OneShotTask, TaskManager
|
from ..task import OneShotTask, RecurringFunctionTask, TaskManager
|
||||||
from ..iocb import IOCB
|
from ..iocb import IOCB
|
||||||
|
|
||||||
from ..basetypes import DeviceAddress, COVSubscription, PropertyValue, \
|
from ..basetypes import DeviceAddress, COVSubscription, PropertyValue, \
|
||||||
|
|
@ -167,6 +167,23 @@ class COVDetection(DetectionAlgorithm):
|
||||||
# list of all active subscriptions
|
# list of all active subscriptions
|
||||||
self.cov_subscriptions = SubscriptionList()
|
self.cov_subscriptions = SubscriptionList()
|
||||||
|
|
||||||
|
def add_subscription(self, cov):
|
||||||
|
if _debug: COVDetection._debug("add_subscription %r", cov)
|
||||||
|
|
||||||
|
# add it to the subscription list for its object
|
||||||
|
self.cov_subscriptions.append(cov)
|
||||||
|
|
||||||
|
def cancel_subscription(self, cov):
|
||||||
|
if _debug: COVDetection._debug("cancel_subscription %r", cov)
|
||||||
|
|
||||||
|
# cancel the subscription timeout
|
||||||
|
if cov.isScheduled:
|
||||||
|
cov.suspend_task()
|
||||||
|
if _debug: COVDetection._debug(" - task suspended")
|
||||||
|
|
||||||
|
# remove it from the subscription list for its object
|
||||||
|
self.cov_subscriptions.remove(cov)
|
||||||
|
|
||||||
def execute(self):
|
def execute(self):
|
||||||
if _debug: COVDetection._debug("execute")
|
if _debug: COVDetection._debug("execute")
|
||||||
|
|
||||||
|
|
@ -296,14 +313,14 @@ class COVIncrementCriteria(COVDetection):
|
||||||
self.previous_reported_value = old_value
|
self.previous_reported_value = old_value
|
||||||
|
|
||||||
# see if it changed enough to trigger reporting
|
# see if it changed enough to trigger reporting
|
||||||
value_changed = (new_value <= (self.previous_reported_value - self.covIncrement)) \
|
value_changed = (new_value <= (self.previous_reported_value - self.obj.covIncrement)) \
|
||||||
or (new_value >= (self.previous_reported_value + self.covIncrement))
|
or (new_value >= (self.previous_reported_value + self.obj.covIncrement))
|
||||||
if _debug: COVIncrementCriteria._debug(" - value significantly changed: %r", value_changed)
|
if _debug: COVIncrementCriteria._debug(" - value significantly changed: %r", value_changed)
|
||||||
|
|
||||||
return value_changed
|
return value_changed
|
||||||
|
|
||||||
def send_cov_notifications(self, subscription=None):
|
def send_cov_notifications(self, subscription=None):
|
||||||
if _debug: COVIncrementCriteria._debug("send_cov_notifications")
|
if _debug: COVIncrementCriteria._debug("send_cov_notifications %r", subscription)
|
||||||
|
|
||||||
# when sending out notifications, keep the current value
|
# when sending out notifications, keep the current value
|
||||||
self.previous_reported_value = self.presentValue
|
self.previous_reported_value = self.presentValue
|
||||||
|
|
@ -376,17 +393,81 @@ class LoadControlCriteria(COVDetection):
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class PulseConverterCriteria(COVDetection):
|
@bacpypes_debugging
|
||||||
|
class PulseConverterCriteria(COVIncrementCriteria):
|
||||||
|
|
||||||
properties_tracked = (
|
properties_tracked = (
|
||||||
'presentValue',
|
'presentValue',
|
||||||
'statusFlags',
|
'statusFlags',
|
||||||
|
'covPeriod',
|
||||||
)
|
)
|
||||||
properties_reported = (
|
properties_reported = (
|
||||||
'presentValue',
|
'presentValue',
|
||||||
'statusFlags',
|
'statusFlags',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def __init__(self, obj):
|
||||||
|
if _debug: PulseConverterCriteria._debug("__init__ %r", obj)
|
||||||
|
COVIncrementCriteria.__init__(self, obj)
|
||||||
|
|
||||||
|
# check for a period
|
||||||
|
if self.covPeriod == 0:
|
||||||
|
if _debug: PulseConverterCriteria._debug(" - no periodic notifications")
|
||||||
|
self.cov_period_task = None
|
||||||
|
else:
|
||||||
|
if _debug: PulseConverterCriteria._debug(" - covPeriod: %r", self.covPeriod)
|
||||||
|
self.cov_period_task = RecurringFunctionTask(self.covPeriod * 1000, self.send_cov_notifications)
|
||||||
|
if _debug: PulseConverterCriteria._debug(" - cov period task created")
|
||||||
|
|
||||||
|
def add_subscription(self, cov):
|
||||||
|
if _debug: PulseConverterCriteria._debug("add_subscription %r", cov)
|
||||||
|
|
||||||
|
# let the parent classes do their thing
|
||||||
|
COVIncrementCriteria.add_subscription(self, cov)
|
||||||
|
|
||||||
|
# if there is a COV period task, install it
|
||||||
|
if self.cov_period_task:
|
||||||
|
self.cov_period_task.install_task()
|
||||||
|
if _debug: PulseConverterCriteria._debug(" - cov period task installed")
|
||||||
|
|
||||||
|
def cancel_subscription(self, cov):
|
||||||
|
if _debug: PulseConverterCriteria._debug("cancel_subscription %r", cov)
|
||||||
|
|
||||||
|
# let the parent classes do their thing
|
||||||
|
COVIncrementCriteria.cancel_subscription(self, cov)
|
||||||
|
|
||||||
|
# if there are no more subscriptions, cancel the task
|
||||||
|
if not len(self.cov_subscriptions):
|
||||||
|
if self.cov_period_task and self.cov_period_task.isScheduled:
|
||||||
|
self.cov_period_task.suspend_task()
|
||||||
|
if _debug: PulseConverterCriteria._debug(" - cov period task suspended")
|
||||||
|
self.cov_period_task = None
|
||||||
|
|
||||||
|
@monitor_filter('covPeriod')
|
||||||
|
def cov_period_filter(self, old_value, new_value):
|
||||||
|
if _debug: PulseConverterCriteria._debug("cov_period_filter %r %r", old_value, new_value)
|
||||||
|
|
||||||
|
# check for an old period
|
||||||
|
if old_value != 0:
|
||||||
|
if self.cov_period_task.isScheduled:
|
||||||
|
self.cov_period_task.suspend_task()
|
||||||
|
if _debug: PulseConverterCriteria._debug(" - canceled old task")
|
||||||
|
self.cov_period_task = None
|
||||||
|
|
||||||
|
# check for a new period
|
||||||
|
if new_value != 0:
|
||||||
|
self.cov_period_task = RecurringFunctionTask(new_value * 1000, self.cov_period_x)
|
||||||
|
self.cov_period_task.install_task()
|
||||||
|
if _debug: PulseConverterCriteria._debug(" - new task created and installed")
|
||||||
|
|
||||||
|
return False
|
||||||
|
|
||||||
|
def send_cov_notifications(self, subscription=None):
|
||||||
|
if _debug: PulseConverterCriteria._debug("send_cov_notifications %r", subscription)
|
||||||
|
|
||||||
|
# pass along to the parent class as if something changed
|
||||||
|
COVIncrementCriteria.send_cov_notifications(self, subscription)
|
||||||
|
|
||||||
|
|
||||||
# mapping from object type to appropriate criteria class
|
# mapping from object type to appropriate criteria class
|
||||||
criteria_type_map = {
|
criteria_type_map = {
|
||||||
|
|
@ -513,22 +594,17 @@ class ChangeOfValueServices(Capability):
|
||||||
def add_subscription(self, cov):
|
def add_subscription(self, cov):
|
||||||
if _debug: ChangeOfValueServices._debug("add_subscription %r", cov)
|
if _debug: ChangeOfValueServices._debug("add_subscription %r", cov)
|
||||||
|
|
||||||
# add it to the subscription list for its object
|
# let the detection algorithm know this is a new or additional subscription
|
||||||
self.cov_detections[cov.obj_ref].cov_subscriptions.append(cov)
|
self.cov_detections[cov.obj_ref].add_subscription(cov)
|
||||||
|
|
||||||
def cancel_subscription(self, cov):
|
def cancel_subscription(self, cov):
|
||||||
if _debug: ChangeOfValueServices._debug("cancel_subscription %r", cov)
|
if _debug: ChangeOfValueServices._debug("cancel_subscription %r", cov)
|
||||||
|
|
||||||
# cancel the subscription timeout
|
|
||||||
if cov.isScheduled:
|
|
||||||
cov.suspend_task()
|
|
||||||
if _debug: ChangeOfValueServices._debug(" - task suspended")
|
|
||||||
|
|
||||||
# get the detection algorithm object
|
# get the detection algorithm object
|
||||||
cov_detection = self.cov_detections[cov.obj_ref]
|
cov_detection = self.cov_detections[cov.obj_ref]
|
||||||
|
|
||||||
# remove it from the subscription list for its object
|
# let the detection algorithm know this subscription is going away
|
||||||
cov_detection.cov_subscriptions.remove(cov)
|
cov_detection.cancel_subscription(cov)
|
||||||
|
|
||||||
# if the detection algorithm doesn't have any subscriptions, remove it
|
# if the detection algorithm doesn't have any subscriptions, remove it
|
||||||
if not len(cov_detection.cov_subscriptions):
|
if not len(cov_detection.cov_subscriptions):
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ from ..debugging import bacpypes_debugging, DebugContents, ModuleLogger
|
||||||
from ..capability import Capability
|
from ..capability import Capability
|
||||||
|
|
||||||
from ..core import deferred
|
from ..core import deferred
|
||||||
from ..task import OneShotTask, TaskManager
|
from ..task import OneShotTask, RecurringFunctionTask, TaskManager
|
||||||
from ..iocb import IOCB
|
from ..iocb import IOCB
|
||||||
|
|
||||||
from ..basetypes import DeviceAddress, COVSubscription, PropertyValue, \
|
from ..basetypes import DeviceAddress, COVSubscription, PropertyValue, \
|
||||||
|
|
@ -167,6 +167,23 @@ class COVDetection(DetectionAlgorithm):
|
||||||
# list of all active subscriptions
|
# list of all active subscriptions
|
||||||
self.cov_subscriptions = SubscriptionList()
|
self.cov_subscriptions = SubscriptionList()
|
||||||
|
|
||||||
|
def add_subscription(self, cov):
|
||||||
|
if _debug: COVDetection._debug("add_subscription %r", cov)
|
||||||
|
|
||||||
|
# add it to the subscription list for its object
|
||||||
|
self.cov_subscriptions.append(cov)
|
||||||
|
|
||||||
|
def cancel_subscription(self, cov):
|
||||||
|
if _debug: COVDetection._debug("cancel_subscription %r", cov)
|
||||||
|
|
||||||
|
# cancel the subscription timeout
|
||||||
|
if cov.isScheduled:
|
||||||
|
cov.suspend_task()
|
||||||
|
if _debug: COVDetection._debug(" - task suspended")
|
||||||
|
|
||||||
|
# remove it from the subscription list for its object
|
||||||
|
self.cov_subscriptions.remove(cov)
|
||||||
|
|
||||||
def execute(self):
|
def execute(self):
|
||||||
if _debug: COVDetection._debug("execute")
|
if _debug: COVDetection._debug("execute")
|
||||||
|
|
||||||
|
|
@ -296,14 +313,14 @@ class COVIncrementCriteria(COVDetection):
|
||||||
self.previous_reported_value = old_value
|
self.previous_reported_value = old_value
|
||||||
|
|
||||||
# see if it changed enough to trigger reporting
|
# see if it changed enough to trigger reporting
|
||||||
value_changed = (new_value <= (self.previous_reported_value - self.covIncrement)) \
|
value_changed = (new_value <= (self.previous_reported_value - self.obj.covIncrement)) \
|
||||||
or (new_value >= (self.previous_reported_value + self.covIncrement))
|
or (new_value >= (self.previous_reported_value + self.obj.covIncrement))
|
||||||
if _debug: COVIncrementCriteria._debug(" - value significantly changed: %r", value_changed)
|
if _debug: COVIncrementCriteria._debug(" - value significantly changed: %r", value_changed)
|
||||||
|
|
||||||
return value_changed
|
return value_changed
|
||||||
|
|
||||||
def send_cov_notifications(self, subscription=None):
|
def send_cov_notifications(self, subscription=None):
|
||||||
if _debug: COVIncrementCriteria._debug("send_cov_notifications")
|
if _debug: COVIncrementCriteria._debug("send_cov_notifications %r", subscription)
|
||||||
|
|
||||||
# when sending out notifications, keep the current value
|
# when sending out notifications, keep the current value
|
||||||
self.previous_reported_value = self.presentValue
|
self.previous_reported_value = self.presentValue
|
||||||
|
|
@ -376,17 +393,81 @@ class LoadControlCriteria(COVDetection):
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class PulseConverterCriteria(COVDetection):
|
@bacpypes_debugging
|
||||||
|
class PulseConverterCriteria(COVIncrementCriteria):
|
||||||
|
|
||||||
properties_tracked = (
|
properties_tracked = (
|
||||||
'presentValue',
|
'presentValue',
|
||||||
'statusFlags',
|
'statusFlags',
|
||||||
|
'covPeriod',
|
||||||
)
|
)
|
||||||
properties_reported = (
|
properties_reported = (
|
||||||
'presentValue',
|
'presentValue',
|
||||||
'statusFlags',
|
'statusFlags',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def __init__(self, obj):
|
||||||
|
if _debug: PulseConverterCriteria._debug("__init__ %r", obj)
|
||||||
|
COVIncrementCriteria.__init__(self, obj)
|
||||||
|
|
||||||
|
# check for a period
|
||||||
|
if self.covPeriod == 0:
|
||||||
|
if _debug: PulseConverterCriteria._debug(" - no periodic notifications")
|
||||||
|
self.cov_period_task = None
|
||||||
|
else:
|
||||||
|
if _debug: PulseConverterCriteria._debug(" - covPeriod: %r", self.covPeriod)
|
||||||
|
self.cov_period_task = RecurringFunctionTask(self.covPeriod * 1000, self.send_cov_notifications)
|
||||||
|
if _debug: PulseConverterCriteria._debug(" - cov period task created")
|
||||||
|
|
||||||
|
def add_subscription(self, cov):
|
||||||
|
if _debug: PulseConverterCriteria._debug("add_subscription %r", cov)
|
||||||
|
|
||||||
|
# let the parent classes do their thing
|
||||||
|
COVIncrementCriteria.add_subscription(self, cov)
|
||||||
|
|
||||||
|
# if there is a COV period task, install it
|
||||||
|
if self.cov_period_task:
|
||||||
|
self.cov_period_task.install_task()
|
||||||
|
if _debug: PulseConverterCriteria._debug(" - cov period task installed")
|
||||||
|
|
||||||
|
def cancel_subscription(self, cov):
|
||||||
|
if _debug: PulseConverterCriteria._debug("cancel_subscription %r", cov)
|
||||||
|
|
||||||
|
# let the parent classes do their thing
|
||||||
|
COVIncrementCriteria.cancel_subscription(self, cov)
|
||||||
|
|
||||||
|
# if there are no more subscriptions, cancel the task
|
||||||
|
if not len(self.cov_subscriptions):
|
||||||
|
if self.cov_period_task and self.cov_period_task.isScheduled:
|
||||||
|
self.cov_period_task.suspend_task()
|
||||||
|
if _debug: PulseConverterCriteria._debug(" - cov period task suspended")
|
||||||
|
self.cov_period_task = None
|
||||||
|
|
||||||
|
@monitor_filter('covPeriod')
|
||||||
|
def cov_period_filter(self, old_value, new_value):
|
||||||
|
if _debug: PulseConverterCriteria._debug("cov_period_filter %r %r", old_value, new_value)
|
||||||
|
|
||||||
|
# check for an old period
|
||||||
|
if old_value != 0:
|
||||||
|
if self.cov_period_task.isScheduled:
|
||||||
|
self.cov_period_task.suspend_task()
|
||||||
|
if _debug: PulseConverterCriteria._debug(" - canceled old task")
|
||||||
|
self.cov_period_task = None
|
||||||
|
|
||||||
|
# check for a new period
|
||||||
|
if new_value != 0:
|
||||||
|
self.cov_period_task = RecurringFunctionTask(new_value * 1000, self.cov_period_x)
|
||||||
|
self.cov_period_task.install_task()
|
||||||
|
if _debug: PulseConverterCriteria._debug(" - new task created and installed")
|
||||||
|
|
||||||
|
return False
|
||||||
|
|
||||||
|
def send_cov_notifications(self, subscription=None):
|
||||||
|
if _debug: PulseConverterCriteria._debug("send_cov_notifications %r", subscription)
|
||||||
|
|
||||||
|
# pass along to the parent class as if something changed
|
||||||
|
COVIncrementCriteria.send_cov_notifications(self, subscription)
|
||||||
|
|
||||||
|
|
||||||
# mapping from object type to appropriate criteria class
|
# mapping from object type to appropriate criteria class
|
||||||
criteria_type_map = {
|
criteria_type_map = {
|
||||||
|
|
@ -513,22 +594,17 @@ class ChangeOfValueServices(Capability):
|
||||||
def add_subscription(self, cov):
|
def add_subscription(self, cov):
|
||||||
if _debug: ChangeOfValueServices._debug("add_subscription %r", cov)
|
if _debug: ChangeOfValueServices._debug("add_subscription %r", cov)
|
||||||
|
|
||||||
# add it to the subscription list for its object
|
# let the detection algorithm know this is a new or additional subscription
|
||||||
self.cov_detections[cov.obj_ref].cov_subscriptions.append(cov)
|
self.cov_detections[cov.obj_ref].add_subscription(cov)
|
||||||
|
|
||||||
def cancel_subscription(self, cov):
|
def cancel_subscription(self, cov):
|
||||||
if _debug: ChangeOfValueServices._debug("cancel_subscription %r", cov)
|
if _debug: ChangeOfValueServices._debug("cancel_subscription %r", cov)
|
||||||
|
|
||||||
# cancel the subscription timeout
|
|
||||||
if cov.isScheduled:
|
|
||||||
cov.suspend_task()
|
|
||||||
if _debug: ChangeOfValueServices._debug(" - task suspended")
|
|
||||||
|
|
||||||
# get the detection algorithm object
|
# get the detection algorithm object
|
||||||
cov_detection = self.cov_detections[cov.obj_ref]
|
cov_detection = self.cov_detections[cov.obj_ref]
|
||||||
|
|
||||||
# remove it from the subscription list for its object
|
# let the detection algorithm know this subscription is going away
|
||||||
cov_detection.cov_subscriptions.remove(cov)
|
cov_detection.cancel_subscription(cov)
|
||||||
|
|
||||||
# if the detection algorithm doesn't have any subscriptions, remove it
|
# if the detection algorithm doesn't have any subscriptions, remove it
|
||||||
if not len(cov_detection.cov_subscriptions):
|
if not len(cov_detection.cov_subscriptions):
|
||||||
|
|
|
||||||
|
|
@ -919,7 +919,9 @@ class StateMachine(object):
|
||||||
def unexpected_receive(self, pdu):
|
def unexpected_receive(self, pdu):
|
||||||
"""Called with PDU that did not match. Unless this is trapped by the
|
"""Called with PDU that did not match. Unless this is trapped by the
|
||||||
state, the default behaviour is to fail."""
|
state, the default behaviour is to fail."""
|
||||||
if _debug: StateMachine._debug("unexpected_receive(%s) %r", self.name, pdu)
|
if _debug:
|
||||||
|
StateMachine._debug("unexpected_receive(%s) %r", self.name, pdu)
|
||||||
|
StateMachine._debug(" - current_state: %r", self.current_state)
|
||||||
|
|
||||||
# go to the unexpected receive state (failing)
|
# go to the unexpected receive state (failing)
|
||||||
self.goto_state(self.unexpected_receive_state)
|
self.goto_state(self.unexpected_receive_state)
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@ Test Services
|
||||||
from . import test_cov
|
from . import test_cov
|
||||||
from . import test_cov_av
|
from . import test_cov_av
|
||||||
from . import test_cov_bv
|
from . import test_cov_bv
|
||||||
|
from . import test_cov_pc
|
||||||
|
|
||||||
from . import test_device
|
from . import test_device
|
||||||
from . import test_file
|
from . import test_file
|
||||||
|
|
|
||||||
750
tests/test_service/test_cov_pc.py
Normal file
750
tests/test_service/test_cov_pc.py
Normal file
|
|
@ -0,0 +1,750 @@
|
||||||
|
#!/usr/bin/env python
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
"""
|
||||||
|
Test Pulse Converter COV Services
|
||||||
|
---------------------------------
|
||||||
|
"""
|
||||||
|
|
||||||
|
import unittest
|
||||||
|
|
||||||
|
from bacpypes.debugging import bacpypes_debugging, ModuleLogger
|
||||||
|
|
||||||
|
from bacpypes.primitivedata import Date, Time
|
||||||
|
from bacpypes.basetypes import DateTime
|
||||||
|
|
||||||
|
from bacpypes.apdu import (
|
||||||
|
SubscribeCOVRequest, SimpleAckPDU,
|
||||||
|
ConfirmedCOVNotificationRequest, UnconfirmedCOVNotificationRequest,
|
||||||
|
)
|
||||||
|
|
||||||
|
from bacpypes.service.cov import ChangeOfValueServices
|
||||||
|
from bacpypes.local.device import LocalDeviceObject
|
||||||
|
from bacpypes.object import PulseConverterObject
|
||||||
|
|
||||||
|
from .helpers import ApplicationNetwork, ApplicationStateMachine, COVTestClientServices
|
||||||
|
|
||||||
|
# some debugging
|
||||||
|
_debug = 0
|
||||||
|
_log = ModuleLogger(globals())
|
||||||
|
|
||||||
|
|
||||||
|
@bacpypes_debugging
|
||||||
|
class TestPulseConverter(unittest.TestCase):
|
||||||
|
|
||||||
|
def test_8_10_1(self):
|
||||||
|
"""Confirmed Notifications Subscription"""
|
||||||
|
if _debug: TestPulseConverter._debug("test_8_10_1")
|
||||||
|
|
||||||
|
# create a network
|
||||||
|
anet = ApplicationNetwork("test_8_10_1")
|
||||||
|
|
||||||
|
# add the ability to accept COV notifications to the TD
|
||||||
|
anet.td.add_capability(COVTestClientServices)
|
||||||
|
|
||||||
|
# tell the TD how to respond to confirmed notifications
|
||||||
|
anet.td.test_ack = True
|
||||||
|
anet.td.test_reject = None
|
||||||
|
anet.td.test_abort = None
|
||||||
|
|
||||||
|
# add the service capability to the IUT
|
||||||
|
anet.iut.add_capability(ChangeOfValueServices)
|
||||||
|
|
||||||
|
# make a pulse converter object
|
||||||
|
test_pc = PulseConverterObject(
|
||||||
|
objectIdentifier=('pulseConverter', 1),
|
||||||
|
objectName='pc',
|
||||||
|
presentValue=0.0,
|
||||||
|
statusFlags=[0, 0, 0, 0],
|
||||||
|
updateTime=DateTime(date=Date().now().value, time=Time().now().value),
|
||||||
|
covIncrement=10.0,
|
||||||
|
covPeriod=10,
|
||||||
|
)
|
||||||
|
|
||||||
|
# add it to the implementation
|
||||||
|
anet.iut.add_object(test_pc)
|
||||||
|
|
||||||
|
# wait for the subscription
|
||||||
|
anet.iut.start_state.doc("8.10.1-1-0") \
|
||||||
|
.receive(SubscribeCOVRequest).doc("8.10.1-1-1") \
|
||||||
|
.success()
|
||||||
|
|
||||||
|
# send the subscription, wait for the ack
|
||||||
|
anet.td.start_state.doc("8.10.1-2-0") \
|
||||||
|
.send(SubscribeCOVRequest(
|
||||||
|
destination=anet.iut.address,
|
||||||
|
subscriberProcessIdentifier=1,
|
||||||
|
monitoredObjectIdentifier=('pulseConverter', 1),
|
||||||
|
issueConfirmedNotifications=True,
|
||||||
|
lifetime=30,
|
||||||
|
)).doc("8.10.1-2-1") \
|
||||||
|
.receive(SimpleAckPDU).doc("8.10.1-2-2") \
|
||||||
|
.success()
|
||||||
|
|
||||||
|
# run the group
|
||||||
|
anet.run()
|
||||||
|
|
||||||
|
def test_8_10_2(self):
|
||||||
|
"""Unconfirmed Notifications Subscription"""
|
||||||
|
if _debug: TestPulseConverter._debug("test_8_10_2")
|
||||||
|
|
||||||
|
# create a network
|
||||||
|
anet = ApplicationNetwork("test_8_10_2")
|
||||||
|
|
||||||
|
# add the ability to accept COV notifications to the TD
|
||||||
|
anet.td.add_capability(COVTestClientServices)
|
||||||
|
|
||||||
|
# tell the TD how to respond to confirmed notifications
|
||||||
|
anet.td.test_ack = True
|
||||||
|
anet.td.test_reject = None
|
||||||
|
anet.td.test_abort = None
|
||||||
|
|
||||||
|
# add the service capability to the IUT
|
||||||
|
anet.iut.add_capability(ChangeOfValueServices)
|
||||||
|
|
||||||
|
# make a pulse converter object
|
||||||
|
test_pc = PulseConverterObject(
|
||||||
|
objectIdentifier=('pulseConverter', 1),
|
||||||
|
objectName='pc',
|
||||||
|
presentValue=0.0,
|
||||||
|
statusFlags=[0, 0, 0, 0],
|
||||||
|
updateTime=DateTime(date=Date().now().value, time=Time().now().value),
|
||||||
|
covIncrement=10.0,
|
||||||
|
covPeriod=10,
|
||||||
|
)
|
||||||
|
|
||||||
|
# add it to the implementation
|
||||||
|
anet.iut.add_object(test_pc)
|
||||||
|
|
||||||
|
# wait for the subscription
|
||||||
|
anet.iut.start_state.doc("8.10.2-1-0") \
|
||||||
|
.receive(SubscribeCOVRequest).doc("8.10.2-1-1") \
|
||||||
|
.success()
|
||||||
|
|
||||||
|
# send the subscription, wait for the ack
|
||||||
|
anet.td.start_state.doc("8.10.2-2-0") \
|
||||||
|
.send(SubscribeCOVRequest(
|
||||||
|
destination=anet.iut.address,
|
||||||
|
subscriberProcessIdentifier=1,
|
||||||
|
monitoredObjectIdentifier=('pulseConverter', 1),
|
||||||
|
issueConfirmedNotifications=False,
|
||||||
|
lifetime=30,
|
||||||
|
)).doc("8.10.2-2-1") \
|
||||||
|
.receive(SimpleAckPDU).doc("8.10.2-2-2") \
|
||||||
|
.success()
|
||||||
|
|
||||||
|
# run the group, cut the time limit short
|
||||||
|
anet.run(time_limit=5.0)
|
||||||
|
|
||||||
|
# check that the IUT still has the detection
|
||||||
|
if _debug: TestPulseConverter._debug(" - detections: %r", anet.iut.cov_detections)
|
||||||
|
assert len(anet.iut.cov_detections) == 1
|
||||||
|
|
||||||
|
# pop out the subscription list and criteria
|
||||||
|
obj_ref, criteria = anet.iut.cov_detections.popitem()
|
||||||
|
if _debug: TestPulseConverter._debug(" - criteria: %r", criteria)
|
||||||
|
|
||||||
|
# get the list of subscriptions from the criteria
|
||||||
|
subscriptions = criteria.cov_subscriptions.cov_subscriptions
|
||||||
|
if _debug: TestPulseConverter._debug(" - subscriptions: %r", subscriptions)
|
||||||
|
assert len(subscriptions) == 1
|
||||||
|
|
||||||
|
def test_8_10_3(self):
|
||||||
|
"""Canceling a Subscription"""
|
||||||
|
if _debug: TestPulseConverter._debug("test_8_10_3")
|
||||||
|
|
||||||
|
# create a network
|
||||||
|
anet = ApplicationNetwork("test_8_10_3")
|
||||||
|
|
||||||
|
# add the ability to accept COV notifications to the TD
|
||||||
|
anet.td.add_capability(COVTestClientServices)
|
||||||
|
|
||||||
|
# tell the TD how to respond to confirmed notifications
|
||||||
|
anet.td.test_ack = True
|
||||||
|
anet.td.test_reject = None
|
||||||
|
anet.td.test_abort = None
|
||||||
|
|
||||||
|
# add the service capability to the IUT
|
||||||
|
anet.iut.add_capability(ChangeOfValueServices)
|
||||||
|
|
||||||
|
# make a pulse converter object
|
||||||
|
test_pc = PulseConverterObject(
|
||||||
|
objectIdentifier=('pulseConverter', 1),
|
||||||
|
objectName='pc',
|
||||||
|
presentValue=0.0,
|
||||||
|
statusFlags=[0, 0, 0, 0],
|
||||||
|
updateTime=DateTime(date=Date().now().value, time=Time().now().value),
|
||||||
|
covIncrement=10.0,
|
||||||
|
covPeriod=10,
|
||||||
|
)
|
||||||
|
|
||||||
|
# add it to the implementation
|
||||||
|
anet.iut.add_object(test_pc)
|
||||||
|
|
||||||
|
# wait for the subscription, then for the cancelation
|
||||||
|
anet.iut.start_state.doc("8.10.3-1-0") \
|
||||||
|
.receive(SubscribeCOVRequest).doc("8.10.3-1-1") \
|
||||||
|
.receive(SubscribeCOVRequest).doc("8.10.3-1-2") \
|
||||||
|
.success()
|
||||||
|
|
||||||
|
# send the subscription, wait for the ack, then send the cancelation
|
||||||
|
# and wait for the ack. Ignore the notification that is sent when
|
||||||
|
# after the subscription
|
||||||
|
anet.td.start_state.doc("8.10.3-2-0") \
|
||||||
|
.send(SubscribeCOVRequest(
|
||||||
|
destination=anet.iut.address,
|
||||||
|
subscriberProcessIdentifier=1,
|
||||||
|
monitoredObjectIdentifier=('pulseConverter', 1),
|
||||||
|
issueConfirmedNotifications=False,
|
||||||
|
lifetime=30,
|
||||||
|
)).doc("8.10.3-2-1") \
|
||||||
|
.ignore(UnconfirmedCOVNotificationRequest) \
|
||||||
|
.receive(SimpleAckPDU).doc("8.10.3-2-2") \
|
||||||
|
.send(SubscribeCOVRequest(
|
||||||
|
destination=anet.iut.address,
|
||||||
|
subscriberProcessIdentifier=1,
|
||||||
|
monitoredObjectIdentifier=('pulseConverter', 1),
|
||||||
|
)).doc("8.10.3-2-1") \
|
||||||
|
.ignore(UnconfirmedCOVNotificationRequest) \
|
||||||
|
.receive(SimpleAckPDU).doc("8.10.3-2-2") \
|
||||||
|
.success()
|
||||||
|
|
||||||
|
# run the group
|
||||||
|
anet.run()
|
||||||
|
|
||||||
|
def test_8_10_4(self):
|
||||||
|
"""Requests 8 Hour Lifetimes"""
|
||||||
|
if _debug: TestPulseConverter._debug("test_8_10_4")
|
||||||
|
|
||||||
|
# create a network
|
||||||
|
anet = ApplicationNetwork("test_8_10_4")
|
||||||
|
|
||||||
|
# add the ability to accept COV notifications to the TD
|
||||||
|
anet.td.add_capability(COVTestClientServices)
|
||||||
|
|
||||||
|
# tell the TD how to respond to confirmed notifications
|
||||||
|
anet.td.test_ack = True
|
||||||
|
anet.td.test_reject = None
|
||||||
|
anet.td.test_abort = None
|
||||||
|
|
||||||
|
# add the service capability to the IUT
|
||||||
|
anet.iut.add_capability(ChangeOfValueServices)
|
||||||
|
|
||||||
|
# make a pulse converter object
|
||||||
|
test_pc = PulseConverterObject(
|
||||||
|
objectIdentifier=('pulseConverter', 1),
|
||||||
|
objectName='pc',
|
||||||
|
presentValue=0.0,
|
||||||
|
statusFlags=[0, 0, 0, 0],
|
||||||
|
updateTime=DateTime(date=Date().now().value, time=Time().now().value),
|
||||||
|
covIncrement=10.0,
|
||||||
|
covPeriod=10,
|
||||||
|
)
|
||||||
|
|
||||||
|
# add it to the implementation
|
||||||
|
anet.iut.add_object(test_pc)
|
||||||
|
|
||||||
|
# wait for the subscription
|
||||||
|
anet.iut.start_state.doc("8.10.4-1-0") \
|
||||||
|
.receive(SubscribeCOVRequest).doc("8.10.4-1-1") \
|
||||||
|
.success()
|
||||||
|
|
||||||
|
# send the subscription, wait for the ack
|
||||||
|
anet.td.start_state.doc("8.10.4-2-0") \
|
||||||
|
.send(SubscribeCOVRequest(
|
||||||
|
destination=anet.iut.address,
|
||||||
|
subscriberProcessIdentifier=1,
|
||||||
|
monitoredObjectIdentifier=('pulseConverter', 1),
|
||||||
|
issueConfirmedNotifications=True,
|
||||||
|
lifetime=28800,
|
||||||
|
)).doc("8.10.4-2-1") \
|
||||||
|
.receive(SimpleAckPDU).doc("8.10.4-2-2") \
|
||||||
|
.success()
|
||||||
|
|
||||||
|
# run the group
|
||||||
|
anet.run()
|
||||||
|
|
||||||
|
def test_9_10_1_1(self):
|
||||||
|
if _debug: TestPulseConverter._debug("test_9_10_1_1")
|
||||||
|
|
||||||
|
notification_fail_time = 0.5
|
||||||
|
|
||||||
|
# create a network
|
||||||
|
anet = ApplicationNetwork("test_9_10_1_1")
|
||||||
|
|
||||||
|
# add the ability to accept COV notifications to the TD
|
||||||
|
anet.td.add_capability(COVTestClientServices)
|
||||||
|
|
||||||
|
# tell the TD how to respond to confirmed notifications
|
||||||
|
anet.td.test_ack = True
|
||||||
|
anet.td.test_reject = None
|
||||||
|
anet.td.test_abort = None
|
||||||
|
|
||||||
|
# add the service capability to the IUT
|
||||||
|
anet.iut.add_capability(ChangeOfValueServices)
|
||||||
|
|
||||||
|
# make a pulse converter object
|
||||||
|
test_pc = PulseConverterObject(
|
||||||
|
objectIdentifier=('pulseConverter', 1),
|
||||||
|
objectName='pc',
|
||||||
|
presentValue=0.0,
|
||||||
|
statusFlags=[0, 0, 0, 0],
|
||||||
|
updateTime=DateTime(date=Date().now().value, time=Time().now().value),
|
||||||
|
covIncrement=10.0,
|
||||||
|
covPeriod=10,
|
||||||
|
)
|
||||||
|
|
||||||
|
# add it to the implementation
|
||||||
|
anet.iut.add_object(test_pc)
|
||||||
|
|
||||||
|
# wait for the subscription, wait for the notification ack
|
||||||
|
anet.iut.start_state.doc("9.10.1.1-1-0") \
|
||||||
|
.receive(SubscribeCOVRequest).doc("9.10.1.1-1-1") \
|
||||||
|
.receive(SimpleAckPDU).doc("9.10.1.1-1-2") \
|
||||||
|
.timeout(10).doc("9.10.1.1-1-3") \
|
||||||
|
.success()
|
||||||
|
|
||||||
|
# test device is quiet
|
||||||
|
wait_for_notification = \
|
||||||
|
anet.td.start_state.doc("9.10.1.1-2-0") \
|
||||||
|
.send(SubscribeCOVRequest(
|
||||||
|
destination=anet.iut.address,
|
||||||
|
subscriberProcessIdentifier=1,
|
||||||
|
monitoredObjectIdentifier=('pulseConverter', 1),
|
||||||
|
issueConfirmedNotifications=True,
|
||||||
|
lifetime=30,
|
||||||
|
)).doc("9.10.1.1-2-1") \
|
||||||
|
.receive(SimpleAckPDU).doc("9.10.1.1-2-2")
|
||||||
|
|
||||||
|
# after the ack, don't wait too long for the notification
|
||||||
|
wait_for_notification \
|
||||||
|
.timeout(notification_fail_time).doc("9.10.1.1-2-3").fail()
|
||||||
|
|
||||||
|
# if the notification is received, success
|
||||||
|
wait_for_notification \
|
||||||
|
.receive(ConfirmedCOVNotificationRequest).doc("9.10.1.1-2-4") \
|
||||||
|
.timeout(10).doc("9.10.1.1-2-5") \
|
||||||
|
.success()
|
||||||
|
|
||||||
|
# run the group
|
||||||
|
anet.run()
|
||||||
|
|
||||||
|
def test_no_traffic(self):
|
||||||
|
"""Test basic configuration of a network."""
|
||||||
|
if _debug: TestPulseConverter._debug("test_no_traffic")
|
||||||
|
|
||||||
|
# create a network
|
||||||
|
anet = ApplicationNetwork("test_no_traffic")
|
||||||
|
|
||||||
|
# add the service capability to the IUT
|
||||||
|
anet.iut.add_capability(ChangeOfValueServices)
|
||||||
|
|
||||||
|
# make a pulse converter object
|
||||||
|
test_pc = PulseConverterObject(
|
||||||
|
objectIdentifier=('pulseConverter', 1),
|
||||||
|
objectName='pc',
|
||||||
|
presentValue=0.0,
|
||||||
|
statusFlags=[0, 0, 0, 0],
|
||||||
|
updateTime=DateTime(date=Date().now().value, time=Time().now().value),
|
||||||
|
covIncrement=10.0,
|
||||||
|
covPeriod=10,
|
||||||
|
)
|
||||||
|
|
||||||
|
# an easy way to change the present value
|
||||||
|
write_test_pc = lambda v: setattr(test_pc, 'presentValue', v)
|
||||||
|
|
||||||
|
# add it to the implementation
|
||||||
|
anet.iut.add_object(test_pc)
|
||||||
|
|
||||||
|
# make some transitions
|
||||||
|
anet.iut.start_state.doc("1-1-0") \
|
||||||
|
.call(write_test_pc, 100.0).doc("1-1-1") \
|
||||||
|
.timeout(1).doc("1-1-2") \
|
||||||
|
.call(write_test_pc, 0.0).doc("1-1-3") \
|
||||||
|
.timeout(1).doc("1-1-4") \
|
||||||
|
.success()
|
||||||
|
|
||||||
|
# test device is quiet
|
||||||
|
anet.td.start_state.timeout(5).success()
|
||||||
|
|
||||||
|
# run the group
|
||||||
|
anet.run()
|
||||||
|
|
||||||
|
def test_8_2_1(self):
|
||||||
|
"""To verify that the IUT can initiate ConfirmedCOVNotification service
|
||||||
|
requests conveying a change of the Present_Value property of Analog
|
||||||
|
Input, Analog Output, and Analog Value objects."""
|
||||||
|
if _debug: TestPulseConverter._debug("test_8_2_1")
|
||||||
|
|
||||||
|
# create a network
|
||||||
|
anet = ApplicationNetwork("test_8_2_1")
|
||||||
|
|
||||||
|
# add the ability to accept COV notifications to the TD
|
||||||
|
anet.td.add_capability(COVTestClientServices)
|
||||||
|
|
||||||
|
# tell the TD how to respond to confirmed notifications
|
||||||
|
anet.td.test_ack = True
|
||||||
|
anet.td.test_reject = None
|
||||||
|
anet.td.test_abort = None
|
||||||
|
|
||||||
|
# add the service capability to the IUT
|
||||||
|
anet.iut.add_capability(ChangeOfValueServices)
|
||||||
|
|
||||||
|
# make a pulse converter object
|
||||||
|
test_pc = PulseConverterObject(
|
||||||
|
objectIdentifier=('pulseConverter', 1),
|
||||||
|
objectName='pc',
|
||||||
|
presentValue=0.0,
|
||||||
|
statusFlags=[0, 0, 0, 0],
|
||||||
|
updateTime=DateTime(date=Date().now().value, time=Time().now().value),
|
||||||
|
covIncrement=10.0,
|
||||||
|
covPeriod=10,
|
||||||
|
)
|
||||||
|
|
||||||
|
# an easy way to change the present value
|
||||||
|
def write_test_pc(v):
|
||||||
|
if _debug: TestPulseConverter._debug("=== marco %r", v)
|
||||||
|
setattr(test_pc, 'presentValue', v)
|
||||||
|
if _debug: TestPulseConverter._debug("=== polo")
|
||||||
|
|
||||||
|
# add it to the implementation
|
||||||
|
anet.iut.add_object(test_pc)
|
||||||
|
|
||||||
|
# receive the subscription request, wait until the client has
|
||||||
|
# received the ack and the 'instant' notification. Then change the
|
||||||
|
# value a little bit and nothing should be sent. Change it some more
|
||||||
|
# and wait for the notification ack.
|
||||||
|
anet.iut.start_state.doc("2-1-0") \
|
||||||
|
.receive(SubscribeCOVRequest).doc("2-1-1") \
|
||||||
|
.receive(SimpleAckPDU).doc("2-1-2") \
|
||||||
|
.wait_event("e1").doc("2-1-3") \
|
||||||
|
.call(write_test_pc, 5.0).doc("2-1-4") \
|
||||||
|
.timeout(5).doc("2-1-5") \
|
||||||
|
.call(write_test_pc, 10.0).doc("2-1-6") \
|
||||||
|
.receive(SimpleAckPDU).doc("2-1-7") \
|
||||||
|
.receive(SimpleAckPDU).doc("2-1-8") \
|
||||||
|
.timeout(10).doc("2-1-9") \
|
||||||
|
.success()
|
||||||
|
|
||||||
|
# send the subscription request, wait for the ack and the 'instant'
|
||||||
|
# notification, set the event so the IUT can continue, then wait
|
||||||
|
# for the next notification
|
||||||
|
anet.td.start_state.doc("2-2-0") \
|
||||||
|
.send(SubscribeCOVRequest(
|
||||||
|
destination=anet.iut.address,
|
||||||
|
subscriberProcessIdentifier=1,
|
||||||
|
monitoredObjectIdentifier=('pulseConverter', 1),
|
||||||
|
issueConfirmedNotifications=True,
|
||||||
|
lifetime=30,
|
||||||
|
)).doc("2-2-1") \
|
||||||
|
.receive(SimpleAckPDU).doc("2-2-2") \
|
||||||
|
.receive(ConfirmedCOVNotificationRequest).doc("2-2-3") \
|
||||||
|
.set_event("e1").doc("2-2-4") \
|
||||||
|
.receive(ConfirmedCOVNotificationRequest).doc("2-2-5") \
|
||||||
|
.receive(ConfirmedCOVNotificationRequest).doc("2-2-6") \
|
||||||
|
.timeout(10).doc("2-2-7") \
|
||||||
|
.success()
|
||||||
|
|
||||||
|
# run the group
|
||||||
|
anet.run()
|
||||||
|
|
||||||
|
def test_simple_transition_unconfirmed(self):
|
||||||
|
if _debug: TestPulseConverter._debug("test_simple_transition_unconfirmed")
|
||||||
|
|
||||||
|
# create a network
|
||||||
|
anet = ApplicationNetwork("test_simple_transition_unconfirmed")
|
||||||
|
|
||||||
|
# add the ability to accept COV notifications to the TD
|
||||||
|
anet.td.add_capability(COVTestClientServices)
|
||||||
|
|
||||||
|
# tell the TD how to respond to confirmed notifications
|
||||||
|
anet.td.test_ack = True
|
||||||
|
anet.td.test_reject = None
|
||||||
|
anet.td.test_abort = None
|
||||||
|
|
||||||
|
# add the service capability to the IUT
|
||||||
|
anet.iut.add_capability(ChangeOfValueServices)
|
||||||
|
|
||||||
|
# make a pulse converter object
|
||||||
|
test_pc = PulseConverterObject(
|
||||||
|
objectIdentifier=('pulseConverter', 1),
|
||||||
|
objectName='pc',
|
||||||
|
presentValue=0.0,
|
||||||
|
statusFlags=[0, 0, 0, 0],
|
||||||
|
updateTime=DateTime(date=Date().now().value, time=Time().now().value),
|
||||||
|
covIncrement=10.0,
|
||||||
|
covPeriod=10,
|
||||||
|
)
|
||||||
|
|
||||||
|
# an easy way to change the present value
|
||||||
|
write_test_pc = lambda v: setattr(test_pc, 'presentValue', v)
|
||||||
|
|
||||||
|
# add it to the implementation
|
||||||
|
anet.iut.add_object(test_pc)
|
||||||
|
|
||||||
|
# receive the subscription request, wait until the client has
|
||||||
|
# received the ack and the 'instant' notification. Then change the
|
||||||
|
# value, no ack coming back
|
||||||
|
anet.iut.start_state.doc("3-1-0") \
|
||||||
|
.receive(SubscribeCOVRequest).doc("3-1-1") \
|
||||||
|
.wait_event("e1").doc("3-1-2") \
|
||||||
|
.call(write_test_pc, 100.0).doc("3-1-3") \
|
||||||
|
.timeout(10).doc("3-2-4") \
|
||||||
|
.success()
|
||||||
|
|
||||||
|
# test device is quiet
|
||||||
|
anet.td.start_state.doc("3-2-0") \
|
||||||
|
.send(SubscribeCOVRequest(
|
||||||
|
destination=anet.iut.address,
|
||||||
|
subscriberProcessIdentifier=1,
|
||||||
|
monitoredObjectIdentifier=('pulseConverter', 1),
|
||||||
|
issueConfirmedNotifications=False,
|
||||||
|
lifetime=30,
|
||||||
|
)).doc("3-2-1") \
|
||||||
|
.receive(SimpleAckPDU).doc("3-2-2") \
|
||||||
|
.receive(UnconfirmedCOVNotificationRequest).doc("3-2-3") \
|
||||||
|
.set_event("e1").doc("3-2-4") \
|
||||||
|
.receive(UnconfirmedCOVNotificationRequest).doc("3-2-5") \
|
||||||
|
.timeout(10).doc("3-2-6") \
|
||||||
|
.success()
|
||||||
|
|
||||||
|
# run the group
|
||||||
|
anet.run()
|
||||||
|
|
||||||
|
def test_changing_status_flags(self):
|
||||||
|
"""This test changes the status flags of binary value point to verify
|
||||||
|
that the detection picks up other changes, most tests just change the
|
||||||
|
present value."""
|
||||||
|
if _debug: TestPulseConverter._debug("test_changing_status_flags")
|
||||||
|
|
||||||
|
# create a network
|
||||||
|
anet = ApplicationNetwork("test_changing_status_flags")
|
||||||
|
|
||||||
|
# add the ability to accept COV notifications to the TD
|
||||||
|
anet.td.add_capability(COVTestClientServices)
|
||||||
|
|
||||||
|
# tell the TD how to respond to confirmed notifications
|
||||||
|
anet.td.test_ack = True
|
||||||
|
anet.td.test_reject = None
|
||||||
|
anet.td.test_abort = None
|
||||||
|
|
||||||
|
# add the service capability to the IUT
|
||||||
|
anet.iut.add_capability(ChangeOfValueServices)
|
||||||
|
|
||||||
|
# make a pulse converter object
|
||||||
|
test_pc = PulseConverterObject(
|
||||||
|
objectIdentifier=('pulseConverter', 1),
|
||||||
|
objectName='pc',
|
||||||
|
presentValue=0.0,
|
||||||
|
statusFlags=[0, 0, 0, 0],
|
||||||
|
updateTime=DateTime(date=Date().now().value, time=Time().now().value),
|
||||||
|
covIncrement=10.0,
|
||||||
|
covPeriod=10,
|
||||||
|
)
|
||||||
|
|
||||||
|
# an easy way to change the present value
|
||||||
|
def test_pc_fault():
|
||||||
|
if _debug: TestPulseConverter._debug("test_pc_fault")
|
||||||
|
test_pc.statusFlags = [0, 1, 0, 0]
|
||||||
|
|
||||||
|
# add it to the implementation
|
||||||
|
anet.iut.add_object(test_pc)
|
||||||
|
|
||||||
|
# receive the subscription request, wait until the client has
|
||||||
|
# received the ack and the 'instant' notification. Then change the
|
||||||
|
# value, no ack coming back
|
||||||
|
anet.iut.start_state.doc("4-1-0") \
|
||||||
|
.receive(SubscribeCOVRequest).doc("4-1-1") \
|
||||||
|
.wait_event("e1").doc("4-1-2") \
|
||||||
|
.call(test_pc_fault).doc("4-1-3") \
|
||||||
|
.timeout(10).doc("4-2-4") \
|
||||||
|
.success()
|
||||||
|
|
||||||
|
# test device is quiet
|
||||||
|
anet.td.start_state.doc("4-2-0") \
|
||||||
|
.send(SubscribeCOVRequest(
|
||||||
|
destination=anet.iut.address,
|
||||||
|
subscriberProcessIdentifier=1,
|
||||||
|
monitoredObjectIdentifier=('pulseConverter', 1),
|
||||||
|
issueConfirmedNotifications=False,
|
||||||
|
lifetime=30,
|
||||||
|
)).doc("4-2-1") \
|
||||||
|
.receive(SimpleAckPDU).doc("4-2-2") \
|
||||||
|
.receive(UnconfirmedCOVNotificationRequest).doc("4-2-3") \
|
||||||
|
.set_event("e1").doc("4-2-4") \
|
||||||
|
.receive(UnconfirmedCOVNotificationRequest).doc("4-2-5") \
|
||||||
|
.timeout(10).doc("4-2-6") \
|
||||||
|
.success()
|
||||||
|
|
||||||
|
# run the group
|
||||||
|
anet.run()
|
||||||
|
|
||||||
|
def test_changing_properties(self):
|
||||||
|
"""This test changes the value of multiple properties to verify that
|
||||||
|
only one COV notification is sent."""
|
||||||
|
if _debug: TestPulseConverter._debug("test_changing_properties")
|
||||||
|
|
||||||
|
# create a network
|
||||||
|
anet = ApplicationNetwork("test_changing_properties")
|
||||||
|
|
||||||
|
# add the ability to accept COV notifications to the TD
|
||||||
|
anet.td.add_capability(COVTestClientServices)
|
||||||
|
|
||||||
|
# tell the TD how to respond to confirmed notifications
|
||||||
|
anet.td.test_ack = True
|
||||||
|
anet.td.test_reject = None
|
||||||
|
anet.td.test_abort = None
|
||||||
|
|
||||||
|
# add the service capability to the IUT
|
||||||
|
anet.iut.add_capability(ChangeOfValueServices)
|
||||||
|
|
||||||
|
# make a pulse converter object
|
||||||
|
test_pc = PulseConverterObject(
|
||||||
|
objectIdentifier=('pulseConverter', 1),
|
||||||
|
objectName='pc',
|
||||||
|
presentValue=0.0,
|
||||||
|
statusFlags=[0, 0, 0, 0],
|
||||||
|
updateTime=DateTime(date=Date().now().value, time=Time().now().value),
|
||||||
|
covIncrement=10.0,
|
||||||
|
covPeriod=10,
|
||||||
|
)
|
||||||
|
|
||||||
|
# an easy way to change the present value
|
||||||
|
def test_pc_fault():
|
||||||
|
if _debug: TestPulseConverter._debug("test_pc_fault")
|
||||||
|
test_pc.presentValue = 100.0
|
||||||
|
test_pc.statusFlags = [0, 0, 1, 0]
|
||||||
|
|
||||||
|
# add it to the implementation
|
||||||
|
anet.iut.add_object(test_pc)
|
||||||
|
|
||||||
|
# receive the subscription request, wait until the client has
|
||||||
|
# received the ack and the 'instant' notification. Then change the
|
||||||
|
# value, no ack coming back
|
||||||
|
anet.iut.start_state.doc("5-1-0") \
|
||||||
|
.receive(SubscribeCOVRequest).doc("5-1-1") \
|
||||||
|
.wait_event("e1").doc("5-1-2") \
|
||||||
|
.call(test_pc_fault).doc("5-1-3") \
|
||||||
|
.timeout(10).doc("5-2-4") \
|
||||||
|
.success()
|
||||||
|
|
||||||
|
# test device is quiet
|
||||||
|
anet.td.start_state.doc("5-2-0") \
|
||||||
|
.send(SubscribeCOVRequest(
|
||||||
|
destination=anet.iut.address,
|
||||||
|
subscriberProcessIdentifier=1,
|
||||||
|
monitoredObjectIdentifier=('pulseConverter', 1),
|
||||||
|
issueConfirmedNotifications=False,
|
||||||
|
lifetime=30,
|
||||||
|
)).doc("5-2-1") \
|
||||||
|
.receive(SimpleAckPDU).doc("5-2-2") \
|
||||||
|
.receive(UnconfirmedCOVNotificationRequest).doc("5-2-3") \
|
||||||
|
.set_event("e1").doc("5-2-4") \
|
||||||
|
.receive(UnconfirmedCOVNotificationRequest).doc("5-2-5") \
|
||||||
|
.timeout(10).doc("5-2-6") \
|
||||||
|
.success()
|
||||||
|
|
||||||
|
# run the group
|
||||||
|
anet.run()
|
||||||
|
|
||||||
|
def test_multiple_subscribers(self):
|
||||||
|
"""This has more than one subscriber for the object."""
|
||||||
|
if _debug: TestPulseConverter._debug("test_multiple_subscribers")
|
||||||
|
|
||||||
|
# create a network
|
||||||
|
anet = ApplicationNetwork("test_multiple_subscribers")
|
||||||
|
|
||||||
|
# add the ability to accept COV notifications to the TD
|
||||||
|
anet.td.add_capability(COVTestClientServices)
|
||||||
|
|
||||||
|
# tell the TD how to respond to confirmed notifications
|
||||||
|
anet.td.test_ack = True
|
||||||
|
anet.td.test_reject = None
|
||||||
|
anet.td.test_abort = None
|
||||||
|
|
||||||
|
# add the service capability to the IUT
|
||||||
|
anet.iut.add_capability(ChangeOfValueServices)
|
||||||
|
|
||||||
|
# make a pulse converter object
|
||||||
|
test_pc = PulseConverterObject(
|
||||||
|
objectIdentifier=('pulseConverter', 1),
|
||||||
|
objectName='pc',
|
||||||
|
presentValue=0.0,
|
||||||
|
statusFlags=[0, 0, 0, 0],
|
||||||
|
updateTime=DateTime(date=Date().now().value, time=Time().now().value),
|
||||||
|
covIncrement=10.0,
|
||||||
|
covPeriod=10,
|
||||||
|
)
|
||||||
|
|
||||||
|
# an easy way to change both the present value and status flags
|
||||||
|
# which should trigger only one notification
|
||||||
|
def test_pc_fault():
|
||||||
|
if _debug: TestPulseConverter._debug("test_pc_fault")
|
||||||
|
test_pc.presentValue = 100.0
|
||||||
|
test_pc.statusFlags = [0, 0, 1, 0]
|
||||||
|
|
||||||
|
# add it to the implementation
|
||||||
|
anet.iut.add_object(test_pc)
|
||||||
|
|
||||||
|
# add another test device object
|
||||||
|
anet.td2_device_object = LocalDeviceObject(
|
||||||
|
objectName="td2",
|
||||||
|
objectIdentifier=('device', 30),
|
||||||
|
maxApduLengthAccepted=1024,
|
||||||
|
segmentationSupported='noSegmentation',
|
||||||
|
vendorIdentifier=999,
|
||||||
|
)
|
||||||
|
|
||||||
|
# another test device
|
||||||
|
anet.td2 = ApplicationStateMachine(anet.td2_device_object, anet.vlan)
|
||||||
|
anet.td2.add_capability(COVTestClientServices)
|
||||||
|
anet.append(anet.td2)
|
||||||
|
|
||||||
|
# receive the subscription requests, wait until both clients have
|
||||||
|
# received the ack and the 'instant' notification. Then change the
|
||||||
|
# value, no ack coming back
|
||||||
|
anet.iut.start_state.doc("6-1-0") \
|
||||||
|
.receive(SubscribeCOVRequest, pduSource=anet.td.address).doc("6-1-1") \
|
||||||
|
.receive(SubscribeCOVRequest, pduSource=anet.td2.address).doc("6-1-2") \
|
||||||
|
.wait_event("e2").doc("6-1-3") \
|
||||||
|
.call(test_pc_fault).doc("6-1-4") \
|
||||||
|
.timeout(10).doc("6-2-5") \
|
||||||
|
.success()
|
||||||
|
|
||||||
|
# first test device; send the subscription request, get an ack
|
||||||
|
# followed by the 'instant' notification
|
||||||
|
anet.td.start_state.doc("6-2-0") \
|
||||||
|
.send(SubscribeCOVRequest(
|
||||||
|
destination=anet.iut.address,
|
||||||
|
subscriberProcessIdentifier=1,
|
||||||
|
monitoredObjectIdentifier=('pulseConverter', 1),
|
||||||
|
issueConfirmedNotifications=False,
|
||||||
|
lifetime=30,
|
||||||
|
)).doc("6-2-1") \
|
||||||
|
.receive(SimpleAckPDU).doc("6-2-2") \
|
||||||
|
.receive(UnconfirmedCOVNotificationRequest).doc("6-2-3") \
|
||||||
|
.set_event("e1").doc("6-2-4") \
|
||||||
|
.receive(UnconfirmedCOVNotificationRequest).doc("6-2-5") \
|
||||||
|
.timeout(10).doc("6-2-6") \
|
||||||
|
.success()
|
||||||
|
|
||||||
|
# same pattern for the other test device
|
||||||
|
anet.td2.start_state.doc("6-3-0") \
|
||||||
|
.wait_event("e1").doc("6-3-1") \
|
||||||
|
.send(SubscribeCOVRequest(
|
||||||
|
destination=anet.iut.address,
|
||||||
|
subscriberProcessIdentifier=1,
|
||||||
|
monitoredObjectIdentifier=('pulseConverter', 1),
|
||||||
|
issueConfirmedNotifications=False,
|
||||||
|
lifetime=30,
|
||||||
|
)).doc("6-3-2") \
|
||||||
|
.receive(SimpleAckPDU).doc("6-3-3") \
|
||||||
|
.receive(UnconfirmedCOVNotificationRequest).doc("6-3-4") \
|
||||||
|
.set_event("e2").doc("6-3-5") \
|
||||||
|
.receive(UnconfirmedCOVNotificationRequest).doc("6-3-6") \
|
||||||
|
.timeout(10).doc("6-3-7") \
|
||||||
|
.success()
|
||||||
|
|
||||||
|
# run the group
|
||||||
|
anet.run()
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user