python/pyosaf/saAmf.py | 79 ++++++------
python/pyosaf/saCkpt.py | 26 ++-
python/pyosaf/saClm.py | 133 +++++++++++----------
python/pyosaf/saEvt.py | 4 +-
python/pyosaf/saImmOi.py | 170 ++++++++++++++-------------
python/pyosaf/saImmOm.py | 2 +-
python/pyosaf/saLck.py | 7 +-
python/pyosaf/saLog.py | 39 +++--
python/pyosaf/saMsg.py | 6 +-
python/pyosaf/saNtf.py | 32 ++--
python/pyosaf/saSmf.py | 5 +-
python/pyosaf/utils/immom/ccb.py | 61 +++++----
python/pyosaf/utils/immom/iterator.py | 17 +-
python/pyosaf/utils/immom/object.py | 1 -
python/pyosaf/utils/log/logger.py | 12 +-
samples/immsv/immom_python/immom.py | 44 +++---
samples/immsv/immom_python/immomexamples.py | 10 +-
17 files changed, 341 insertions(+), 307 deletions(-)
Correct some of the warnings generated by pylint.
diff --git a/python/pyosaf/saAmf.py b/python/pyosaf/saAmf.py
--- a/python/pyosaf/saAmf.py
+++ b/python/pyosaf/saAmf.py
@@ -15,9 +15,12 @@
#
############################################################################
-from ctypes import *
-from saAis import *
-from saNtf import *
+from ctypes import POINTER, Structure, CFUNCTYPE, CDLL, Union
+from pyosaf.saAis import SaAisErrorT, SaInvocationT, SaNameT, SaUint64T, \
+ SaUint32T, SaTimeT, SaUint8T, SaInt64T, SaInt32T, SaDispatchFlagsT, \
+ SaVersionT, SaSelectionObjectT, SaEnumT, Enumeration, SaInt8T, \
+ SaUint16T, Const, BYREF
+from pyosaf.saNtf import SaNtfIdentifierT, SaNtfCorrelationIdsT
# Only mirrors API calls implemented in osaf/libs/agents/saf/ava/ava_api.c
# If it ain't implemented here (or is commented out here),
@@ -33,7 +36,7 @@ saAmf.SA_AMF_PM_ZERO_EXIT = 0x1
saAmf.SA_AMF_PM_NON_ZERO_EXIT = 0x2
saAmf.SA_AMF_PM_ABNORMAL_END = 0x4
-SaAmfPmErrorsT = SaUint32T
+SaAmfPmErrorsT = SaUint32T
SaAmfPmStopQualifierT = SaEnumT
eSaAmfPmStopQualifierT = Enumeration((
@@ -137,7 +140,7 @@ saAmf.SA_AMF_CSI_ADD_ONE = 0X1
saAmf.SA_AMF_CSI_TARGET_ONE = 0X2
saAmf.SA_AMF_CSI_TARGET_ALL = 0X4
-SaAmfCSIFlagsT = SaUint32T
+SaAmfCSIFlagsT = SaUint32T
SaAmfCSITransitionDescriptorT = SaEnumT
eSaAmfCSITransitionDescriptorT = Enumeration((
@@ -150,7 +153,7 @@ eSaAmfCSITransitionDescriptorT = Enumera
class SaAmfCSIActiveDescriptorT(Structure):
"""Contain information associated with active assignment.
"""
- _fields_ = [('transitionDescriptor',SaAmfCSITransitionDescriptorT),
+ _fields_ = [('transitionDescriptor', SaAmfCSITransitionDescriptorT),
('activeCompName', SaNameT)]
class SaAmfCSIStandbyDescriptorT(Structure):
@@ -164,7 +167,7 @@ class SaAmfCSIStateDescriptorT(Union):
"""
_fields_ = [('activeDescriptor', SaAmfCSIActiveDescriptorT),
('standbyDescriptor', SaAmfCSIStandbyDescriptorT)]
-
+
class SaAmfCSIAttributeT(Structure):
"""Contain a single CSI attribute's name and value strings.
"""
@@ -269,7 +272,7 @@ saAmf.SA_AMF_COMP_CONTAINER = 0x0010
saAmf.SA_AMF_COMP_CONTAINED = 0x0020
saAmf.SA_AMF_COMP_PROXIED_NPI = 0x0040
-SaAmfCompCategoryT = SaUint32T
+SaAmfCompCategoryT = SaUint32T
SaAmfRedundancyModelT = SaEnumT
eSaAmfRedundancyModelT = Enumeration((
@@ -416,7 +419,7 @@ def saAmfInitialize(amfHandle, amfCallba
SaAisErrorT
"""
-
+
amfdll.saAmfInitialize.argtypes = [POINTER(SaAmfHandleT),
POINTER(SaAmfCallbacksT),
POINTER(SaVersionT)]
@@ -443,7 +446,7 @@ def saAmfPmStart(amfHandle, compName, pr
SaAisErrorT
"""
-
+
amfdll.saAmfPmStart.argtypes = [SaAmfHandleT,
POINTER(SaNameT),
SaUint64T,
@@ -457,7 +460,7 @@ def saAmfPmStart(amfHandle, compName, pr
descendentsTreeDepth, pmErrors, recommendedRecovery)
#endif /* SA_AMF_B01 || SA_AMF_B02 */
-#ifdef SA_AMF_B03
+#ifdef SA_AMF_B03
class SaAmfCallbacksT_3(Structure):
"""Contain various callbacks AMF may invoke on a component.
"""
@@ -492,7 +495,7 @@ def saAmfInitialize_3(amfHandle, amfCall
SaAisErrorT
"""
-
+
amfdll.saAmfInitialize_3.argtypes = [POINTER(SaAmfHandleT),
POINTER(SaAmfCallbacksT_3),
POINTER(SaVersionT)]
@@ -517,7 +520,7 @@ def saAmfComponentUnregister(amfHandle,
SaAisErrorT
"""
-
+
amfdll.saAmfComponentUnregister.argtypes = [SaAmfHandleT,
POINTER(SaNameT),
POINTER(SaNameT)]
@@ -566,7 +569,7 @@ def saAmfProtectionGroupNotificationFree
SaAisErrorT
"""
-
+
amfdll.saAmfProtectionGroupNotificationFree.argtypes = [SaAmfHandleT,
POINTER(SaAmfProtectionGroupNotificationT)]
@@ -591,7 +594,7 @@ def saAmfComponentErrorReport(amfHandle,
SaAisErrorT
"""
-
+
amfdll.saAmfComponentErrorReport.argtypes = [SaAmfHandleT,
POINTER(SaNameT),
SaTimeT,
@@ -630,7 +633,7 @@ def saAmfResponse(amfHandle, invocation,
SaAisErrorT
"""
-
+
amfdll.saAmfResponse.argtypes = [SaAmfHandleT,
SaInvocationT,
SaAisErrorT]
@@ -674,7 +677,7 @@ def saAmfInitialize_4(amfHandle, amfCall
SaAisErrorT
"""
-
+
amfdll.saAmfInitialize_4.argtypes = [POINTER(SaAmfHandleT),
POINTER(SaAmfCallbacksT_4),
POINTER(SaVersionT)]
@@ -696,7 +699,7 @@ def saAmfSelectionObjectGet(amfHandle, s
SaAisErrorT
"""
-
+
amfdll.saAmfSelectionObjectGet.argtypes = [SaAmfHandleT,
POINTER(SaSelectionObjectT)]
@@ -716,7 +719,7 @@ def saAmfDispatch(amfHandle, dispatchFla
SaAisErrorT
"""
-
+
amfdll.saAmfDispatch.argtypes = [SaAmfHandleT,
SaDispatchFlagsT]
@@ -734,7 +737,7 @@ def saAmfFinalize(amfHandle):
SaAisErrorT
"""
-
+
amfdll.saAmfFinalize.argtypes = [SaAmfHandleT]
amfdll.saAmfFinalize.restype = SaAisErrorT
@@ -753,7 +756,7 @@ def saAmfComponentRegister(amfHandle, co
SaAisErrorT
"""
-
+
amfdll.saAmfComponentRegister.argtypes = [SaAmfHandleT,
POINTER(SaNameT),
POINTER(SaNameT)]
@@ -775,7 +778,7 @@ def saAmfComponentNameGet(amfHandle, com
SaAisErrorT
"""
-
+
amfdll.saAmfComponentNameGet.argtypes = [SaAmfHandleT,
POINTER(SaNameT)]
@@ -800,7 +803,7 @@ def saAmfPmStart_3(amfHandle,
SaAisErrorT
"""
-
+
amfdll.saAmfPmStart_3.argtypes = [SaAmfHandleT,
POINTER(SaNameT),
SaInt64T,
@@ -828,7 +831,7 @@ def saAmfPmStop(amfHandle, compName, sto
SaAisErrorT
"""
-
+
amfdll.saAmfPmStop.argtypes = [SaAmfHandleT,
POINTER(SaNameT),
SaAmfPmStopQualifierT,
@@ -856,7 +859,7 @@ def saAmfHealthcheckStart(amfHandle,
SaAisErrorT
"""
-
+
amfdll.saAmfHealthcheckStart.argtypes = [SaAmfHandleT,
POINTER(SaNameT),
POINTER(SaAmfHealthcheckKeyT),
@@ -883,7 +886,7 @@ def saAmfHealthcheckConfirm(amfHandle,
SaAisErrorT
"""
-
+
amfdll.saAmfHealthcheckConfirm.argtypes = [SaAmfHandleT,
POINTER(SaNameT),
POINTER(SaAmfHealthcheckKeyT),
@@ -907,7 +910,7 @@ def saAmfHealthcheckStop(amfHandle, comp
SaAisErrorT
"""
-
+
amfdll.saAmfHealthcheckStop.argtypes = [SaAmfHandleT,
POINTER(SaNameT),
POINTER(SaAmfHealthcheckKeyT)]
@@ -930,7 +933,7 @@ def saAmfCSIQuiescingComplete(amfHandle,
SaAisErrorT
"""
-
+
amfdll.saAmfCSIQuiescingComplete.argtypes = [SaAmfHandleT,
SaInvocationT,
SaAisErrorT]
@@ -954,7 +957,7 @@ def saAmfHAReadinessStateSet(amfHandle,
SaAisErrorT
"""
-
+
amfdll.saAmfHAReadinessStateSet.argtypes = [SaAmfHandleT,
POINTER(SaNameT),
POINTER(SaNameT),
@@ -962,7 +965,7 @@ def saAmfHAReadinessStateSet(amfHandle,
POINTER(SaNtfCorrelationIdsT)]
amfdll.saAmfHAReadinessStateSet.restype = SaAisErrorT
-
+
return amfdll.saAmfHAReadinessStateSet(amfHandle,
BYREF(compName), BYREF(csiName), haReadinessState,
BYREF(correlationIds))
@@ -980,7 +983,7 @@ def saAmfHAStateGet(amfHandle, compName,
SaAisErrorT
"""
-
+
amfdll.saAmfHAStateGet.argtypes = [SaAmfHandleT,
POINTER(SaNameT),
POINTER(SaNameT),
@@ -1005,7 +1008,7 @@ def saAmfProtectionGroupTrack_4(amfHandl
SaAisErrorT
"""
-
+
amfdll.saAmfProtectionGroupTrack_4.argtypes = [SaAmfHandleT,
POINTER(SaNameT),
SaUint8T,
@@ -1027,7 +1030,7 @@ def saAmfProtectionGroupTrackStop(amfHan
SaAisErrorT
"""
-
+
amfdll.saAmfProtectionGroupTrackStop.argtypes = [SaAmfHandleT,
POINTER(SaNameT)]
@@ -1047,7 +1050,7 @@ def saAmfProtectionGroupNotificationFree
SaAisErrorT
"""
-
+
amfdll.saAmfProtectionGroupNotificationFree_4.argtypes = [SaAmfHandleT,
POINTER(SaAmfProtectionGroupNotificationT_4)]
@@ -1072,7 +1075,7 @@ def saAmfComponentErrorReport_4(amfHandl
SaAisErrorT
"""
-
+
amfdll.saAmfComponentErrorReport_4.argtypes = [SaAmfHandleT,
POINTER(SaNameT),
SaTimeT,
@@ -1100,7 +1103,7 @@ def saAmfCorrelationIdsGet(amfHandle, in
SaAisErrorT
"""
-
+
amfdll.saAmfCorrelationIdsGet.argtypes = [SaAmfHandleT,
SaInvocationT,
POINTER(SaNtfCorrelationIdsT)]
@@ -1122,7 +1125,7 @@ def saAmfComponentErrorClear_4(amfHandle
SaAisErrorT
"""
-
+
amfdll.saAmfComponentErrorClear_4.argtypes = [SaAmfHandleT,
POINTER(SaNtfCorrelationIdsT),
POINTER(SaNtfCorrelationIdsT)]
@@ -1145,7 +1148,7 @@ def saAmfResponse_4(amfHandle, invocatio
SaAisErrorT
"""
-
+
amfdll.saAmfResponse_4.argtypes = [SaAmfHandleT,
SaInvocationT,
POINTER(SaNtfCorrelationIdsT),
diff --git a/python/pyosaf/saCkpt.py b/python/pyosaf/saCkpt.py
--- a/python/pyosaf/saCkpt.py
+++ b/python/pyosaf/saCkpt.py
@@ -15,12 +15,15 @@
#
############################################################################
-from ctypes import *
-from saAis import *
+from ctypes import POINTER, CFUNCTYPE, Structure, CDLL
+from pyosaf.saAis import BYREF, SaUint64T, Const, SaUint32T, SaAisErrorT, \
+ SaUint8T, SaInvocationT, SaSizeT, SaVoidPtr, SaNameT, SaEnumT, \
+ Enumeration, SaTimeT, SaUint16T, SaOffsetT, SaVersionT, \
+ SaSelectionObjectT, SaDispatchFlagsT
ckptdll = CDLL('libSaCkpt.so.1')
-SaCkptHandleT = SaUint64T
+SaCkptHandleT = SaUint64T
SaCkptCheckpointHandleT = SaUint64T
SaCkptSectionIterationHandleT = SaUint64T
@@ -130,7 +133,8 @@ SaCkptCheckpointSynchronizeCallbackT = C
SaInvocationT, SaAisErrorT)
SaCkptCheckpointTrackCallbackT = CFUNCTYPE(None,
- SaCkptCheckpointHandleT, POINTER(SaCkptIOVectorElementT),
SaUint32T)
+ SaCkptCheckpointHandleT, POINTER(SaCkptIOVectorElementT),
+ SaUint32T)
class SaCkptCallbacksT(Structure):
@@ -561,7 +565,7 @@ def saCkptSectionIterationNext(sectionIt
return ckptdll.saCkptSectionIterationNext(sectionIterationHandle,
BYREF(sectionDescriptor))
-
+
def saCkptSectionIterationFinalize(sectionIterationHandle):
"""Free resources allocated for iteration.
@@ -720,12 +724,12 @@ def saCkptCheckpointSynchronizeAsync(che
return ckptdll.saCkptCheckpointSynchronizeAsync(checkpointHandle,
invocation)
-def saCkptSectionIdFree(checkpointHandle, id):
- """Free memory to which id points, allocated by saCkptSectionCreate().
+def saCkptSectionIdFree(checkpointHandle, section_id):
+ """Free memory to which section_id points, allocated by
saCkptSectionCreate().
type arguments:
SaCkptCheckpointHandleT checkpointHandle
- POINTER(SaUint8T) id
+ POINTER(SaUint8T) section_id
returns:
SaAisErrorT
@@ -738,8 +742,8 @@ def saCkptSectionIdFree(checkpointHandle
ckptdll.saCkptSectionIdFree.restype = SaAisErrorT
- return ckptdll.saCkptSectionIdFree(checkpointHandle,
-
BYREF(id))
+ return ckptdll.saCkptSectionIdFree(checkpointHandle,
+ BYREF(section_id))
def saCkptIOVectorElementDataFree(checkpointHandle, data):
"""Free memory to which data points, allocated by
saCkptCheckpointRead().
@@ -759,7 +763,7 @@ def saCkptIOVectorElementDataFree(checkp
ckptdll.saCkptIOVectorElementDataFree.restype = SaAisErrorT
- return ckptdll.saCkptIOVectorElementDataFree(checkpointHandle,
+ return ckptdll.saCkptIOVectorElementDataFree(checkpointHandle,
data)
def saCkptTrack(ckptHandle):
diff --git a/python/pyosaf/saClm.py b/python/pyosaf/saClm.py
--- a/python/pyosaf/saClm.py
+++ b/python/pyosaf/saClm.py
@@ -15,9 +15,12 @@
#
############################################################################
-from ctypes import *
-from saAis import *
-import saNtf
+from ctypes import POINTER, CDLL, Structure, CFUNCTYPE
+from pyosaf.saAis import SaUint64T, SaUint32T, Const, SaEnumT, Enumeration, \
+ SaBoolT, SaTimeT, SaNameT, SaAisErrorT, SaInvocationT, BYREF, \
+ SaVersionT, SaSelectionObjectT, SaInt8T, SaDispatchFlagsT, SaUint8T, \
+ SaUint16T
+from pyosaf import saNtf
clmdll = CDLL('libSaClm.so.0')
@@ -239,13 +242,13 @@ def saClmInitialize(clmHandle, clmCallba
returns:
SaAisErrorT
"""
-
+
clmdll.saClmInitialize.argtypes = [POINTER(SaClmHandleT),
-
POINTER(SaClmCallbacksT),
-
POINTER(SaVersionT)]
-
+ POINTER(SaClmCallbacksT),
+ POINTER(SaVersionT)]
+
clmdll.saClmInitialize.restype = SaAisErrorT
-
+
return clmdll.saClmInitialize(BYREF(clmHandle),
BYREF(clmCallbacks), BYREF(version))
#endif /* SA_CLM_B01 || SA_CLM_B02 */
@@ -263,7 +266,7 @@ def saClmInitialize_3(clmHandle, clmCall
SaAisErrorT
"""
- return clmdll.saClmInitialize_3(BYREF(clmHandle),
+ return clmdll.saClmInitialize_3(BYREF(clmHandle),
BYREF(clmCallbacks), BYREF(version))
#endif /* SA_CLM_B03 */
@@ -279,11 +282,11 @@ def saClmInitialize_4(clmHandle, clmCall
SaAisErrorT
"""
clmdll.saClmInitialize_4.argtypes = [POINTER(SaClmHandleT),
-
POINTER(SaClmCallbacksT_4),
-
POINTER(SaVersionT)]
-
+ POINTER(SaClmCallbacksT_4),
+ POINTER(SaVersionT)]
+
clmdll.saClmInitialize_4.restype = SaAisErrorT
-
+
return clmdll.saClmInitialize_4(BYREF(clmHandle),
BYREF(clmCallbacks), BYREF(version))
@@ -298,12 +301,12 @@ def saClmSelectionObjectGet(clmHandle, s
returns:
SaAisErrorT
"""
-
+
clmdll.saClmSelectionObjectGet.argtypes = [SaClmHandleT,
-
POINTER(SaSelectionObjectT)]
-
+ POINTER(SaSelectionObjectT)]
+
clmdll.saClmSelectionObjectGet.restype = SaAisErrorT
-
+
return clmdll.saClmSelectionObjectGet(clmHandle,
BYREF(selectionObject))
@@ -317,11 +320,11 @@ def saClmDispatch(clmHandle, dispatchFla
returns:
SaAisErrorT
"""
-
+
clmdll.saClmDispatch.argtypes = [SaClmHandleT, SaDispatchFlagsT]
-
+
clmdll.saClmDispatch.restype = SaAisErrorT
-
+
return clmdll.saClmDispatch(clmHandle, dispatchFlags)
def saClmFinalize(clmHandle):
@@ -333,11 +336,11 @@ def saClmFinalize(clmHandle):
returns:
SaAisErrorT
"""
-
+
clmdll.saClmFinalize.argtypes = [SaClmHandleT]
-
+
clmdll.saClmFinalize.restype = SaAisErrorT
-
+
return clmdll.saClmFinalize(clmHandle)
#if defined(SA_CLM_B01) || defined(SA_CLM_B02) || defined(SA_CLM_B03)
@@ -353,13 +356,13 @@ def saClmClusterTrack(clmHandle, trackFl
returns:
SaAisErrorT
"""
-
+
clmdll.saClmClusterTrack.argtypes = [SaClmHandleT,
-
SaUint8T,
-
POINTER(SaClmClusterNotificationBufferT)]
-
+ SaUint8T,
+
POINTER(SaClmClusterNotificationBufferT)]
+
clmdll.saClmClusterTrack.restype = SaAisErrorT
-
+
return clmdll.saClmClusterTrack(clmHandle,
trackFlags,
BYREF(notificationBuffer))
@@ -376,16 +379,16 @@ def saClmClusterNodeGet(clmHandle, nodeI
returns:
SaAisErrorT
"""
-
- clmdll.saClmClusterNodeGet.argtypes = [SaClmHandleT,
-
SaClmNodeIdT,
-
SaTimeT,
-
POINTER(SaClmClusterNodeT)]
-
+
+ clmdll.saClmClusterNodeGet.argtypes = [SaClmHandleT,
+ SaClmNodeIdT,
+ SaTimeT,
+ POINTER(SaClmClusterNodeT)]
+
clmdll.saClmClusterNodeGet.restype = SaAisErrorT
-
+
return clmdll.saClmClusterNodeGet(clmHandle,
- nodeId,
+ nodeId,
timeout,
BYREF(clusterNode))
#endif /* SA_CLM_B01 || SA_CLM_B02 || SA_CLM_B03 */
@@ -417,13 +420,13 @@ def saClmClusterTrack_4(clmHandle, track
returns:
SaAisErrorT
"""
-
+
clmdll.saClmClusterTrack_4.argtypes = [SaClmHandleT,
-
SaUint8T,
-
POINTER(SaClmClusterNotificationBufferT_4)]
+ SaUint8T,
+
POINTER(SaClmClusterNotificationBufferT_4)]
clmdll.saClmClusterTrack_4.restype = SaAisErrorT
-
+
return clmdll.saClmClusterTrack_4(clmHandle,
trackFlags,
BYREF(notificationBuffer))
@@ -438,11 +441,11 @@ def saClmClusterTrackStop(clmHandle):
returns:
SaAisErrorT
"""
-
- clmdll.saClmClusterTrackStop.argtypes = [SaClmHandleT]
+
+ clmdll.saClmClusterTrackStop.argtypes = [SaClmHandleT]
clmdll.saClmClusterTrackStop.restype = SaAisErrorT
-
+
return clmdll.saClmClusterTrackStop(clmHandle)
def saClmClusterNotificationFree_4(clmHandle, notification):
@@ -455,14 +458,14 @@ def saClmClusterNotificationFree_4(clmHa
returns:
SaAisErrorT
"""
-
+
clmdll.saClmClusterNotificationFree_4.argtypes = [SaClmHandleT,
-
POINTER(SaClmClusterNotificationT_4)]
-
+
POINTER(SaClmClusterNotificationT_4)]
+
clmdll.saClmClusterNotificationFree_4.restype = SaAisErrorT
-
- return clmdll.saClmClusterNotificationFree_4(clmHandle,
-
BYREF(notification))
+
+ return clmdll.saClmClusterNotificationFree_4(clmHandle,
+ BYREF(notification))
def saClmClusterNodeGet_4(clmHandle, nodeId, timeout, clusterNode):
"""Synchronously retrieve information about identified member node.
@@ -476,14 +479,14 @@ def saClmClusterNodeGet_4(clmHandle, nod
returns:
SaAisErrorT
"""
-
+
clmdll.saClmClusterNodeGet_4.argtypes = [SaClmHandleT,
-
SaClmNodeIdT,
-
SaTimeT,
-
POINTER(SaClmClusterNodeT_4)]
-
+ SaClmNodeIdT,
+ SaTimeT,
+ POINTER(SaClmClusterNodeT_4)]
+
clmdll.saClmClusterNodeGet_4.restype = SaAisErrorT
-
+
return clmdll.saClmClusterNodeGet_4(clmHandle,
nodeId,
timeout,
@@ -500,13 +503,13 @@ def saClmClusterNodeGetAsync(clmHandle,
returns:
SaAisErrorT
"""
-
+
clmdll.saClmClusterNodeGetAsync.argtypes = [SaClmHandleT,
-
SaInvocationT,
-
SaClmNodeIdT]
-
+ SaInvocationT,
+ SaClmNodeIdT]
+
clmdll.saClmClusterNodeGetAsync.restype = SaAisErrorT
-
+
return clmdll.saClmClusterNodeGetAsync(clmHandle, invocation, nodeId)
def saClmResponse_4(clmHandle, invocation, response):
@@ -520,11 +523,11 @@ def saClmResponse_4(clmHandle, invocatio
returns:
SaAisErrorT
"""
-
- clmdll.saClmResponse_4.argtypes = [SaClmHandleT,
-
SaInvocationT,
-
SaClmResponseT]
+
+ clmdll.saClmResponse_4.argtypes = [SaClmHandleT,
+ SaInvocationT,
+ SaClmResponseT]
clmdll.saClmResponse_4.restype = SaAisErrorT
-
+
return clmdll.saClmResponse_4(clmHandle, invocation, response)
diff --git a/python/pyosaf/saEvt.py b/python/pyosaf/saEvt.py
--- a/python/pyosaf/saEvt.py
+++ b/python/pyosaf/saEvt.py
@@ -15,8 +15,8 @@
#
############################################################################
-from ctypes import *
-from saAis import *
+from ctypes import POINTER, CFUNCTYPE, Structure, CDLL, create_string_buffer
+from pyosaf.saAis import SaUint64T, SaUint32T, SaInvocationT, SaAisErrorT,
SaSizeT, SaUint8T, BYREF, SaEnumT, Enumeration, SaInt8T, Const
evtdll = CDLL('libSaEvt.so.1')
diff --git a/python/pyosaf/saImmOi.py b/python/pyosaf/saImmOi.py
--- a/python/pyosaf/saImmOi.py
+++ b/python/pyosaf/saImmOi.py
@@ -15,10 +15,14 @@
#
############################################################################
-from ctypes import *
-from saImm import *
-from saAis import *
-from saImmOm import SaImmCcbHandleT, SaImmAdminOwnerHandleT
+from ctypes import POINTER, CFUNCTYPE, CDLL, Structure
+from pyosaf.saImm import SaImmAttrNameT, SaImmClassNameT, SaImmAttrValuesT_2, \
+ SaImmAttrModificationT_2, SaImmAdminOperationIdT, \
+ SaImmAdminOperationIdT, SaImmAdminOperationParamsT_2, SaImmScopeT
+from pyosaf.saAis import SaUint64T, SaStringT, SaAisErrorT, SaNameT, \
+ SaInvocationT, SaVersionT, BYREF, SaSelectionObjectT, \
+ SaDispatchFlagsT, marshalNullArray
+from pyosaf.saImmOm import SaImmCcbHandleT, SaImmAdminOwnerHandleT
oidll = CDLL('libSaImmOi.so.0')
@@ -68,7 +72,7 @@ class SaImmOiCallbacksT_2(Structure):
SaImmOiCcbApplyCallbackT),
('saImmOiCcbCompletedCallback',
SaImmOiCcbCompletedCallbackT),
- ('saImmOiCcbObjectCreateCallback',
+ ('saImmOiCcbObjectCreateCallback',
SaImmOiCcbObjectCreateCallbackT_2),
('saImmOiCcbObjectDeleteCallback',
SaImmOiCcbObjectDeleteCallbackT),
@@ -91,10 +95,10 @@ def saImmOiInitialize_2(immOiHandle, imm
"""
oidll.saImmOiInitialize_2.argtypes = [POINTER(SaImmOiHandleT),
-
POINTER(SaImmOiCallbacksT_2),
-
POINTER(SaVersionT)]
+ POINTER(SaImmOiCallbacksT_2),
+ POINTER(SaVersionT)]
oidll.saImmOiInitialize_2.restype = SaAisErrorT
-
+
return oidll.saImmOiInitialize_2(BYREF(immOiHandle),
BYREF(immOiCallbacks),
BYREF(version))
@@ -111,12 +115,12 @@ def saImmOiSelectionObjectGet(immOiHandl
SaAisErrorT
"""
-
+
oidll.saImmOiSelectionObjectGet.argtypes = [SaImmOiHandleT,
-
POINTER(SaSelectionObjectT)]
-
+
POINTER(SaSelectionObjectT)]
+
oidll.saImmOiSelectionObjectGet.restype = SaAisErrorT
-
+
return oidll.saImmOiSelectionObjectGet(immOiHandle,
BYREF(selectionObject))
@@ -131,11 +135,11 @@ def saImmOiDispatch(immOiHandle, dispatc
SaAisErrorT
"""
-
- oidll.saImmOiDispatch.argtypes = [SaImmOiHandleT,SaDispatchFlagsT]
-
+
+ oidll.saImmOiDispatch.argtypes = [SaImmOiHandleT, SaDispatchFlagsT]
+
oidll.saImmOiDispatch.restype = SaAisErrorT
-
+
return oidll.saImmOiDispatch(immOiHandle, dispatchFlags)
def saImmOiFinalize(immOiHandle):
@@ -148,11 +152,11 @@ def saImmOiFinalize(immOiHandle):
SaAisErrorT
"""
-
+
oidll.saImmOiFinalize.argtypes = [SaImmOiHandleT]
-
+
oidll.saImmOiFinalize.restype = SaAisErrorT
-
+
return oidll.saImmOiFinalize(immOiHandle)
def saImmOiImplementerSet(immOiHandle, implementerName):
@@ -167,11 +171,11 @@ def saImmOiImplementerSet(immOiHandle, i
SaAisErrorT
"""
-
+
oidll.saImmOiImplementerSet.argtypes = [SaImmOiHandleT,
-
SaImmOiImplementerNameT]
+ SaImmOiImplementerNameT]
oidll.saImmOiImplementerSet.restype = SaAisErrorT
-
+
return oidll.saImmOiImplementerSet(immOiHandle, implementerName)
def saImmOiImplementerClear(immOiHandle):
@@ -187,7 +191,7 @@ def saImmOiImplementerClear(immOiHandle)
"""
oidll.saImmOiImplementerClear.argtypes = [SaImmOiHandleT]
oidll.saImmOiImplementerClear.restype = SaAisErrorT
-
+
return oidll.saImmOiImplementerClear(immOiHandle)
def saImmOiClassImplementerSet(immOiHandle, className):
@@ -204,10 +208,10 @@ def saImmOiClassImplementerSet(immOiHand
"""
oidll.saImmOiClassImplementerSet.argtypes = [SaImmOiHandleT,
-
SaImmClassNameT]
-
+ SaImmClassNameT]
+
oidll.saImmOiClassImplementerSet.restype = SaAisErrorT
-
+
return oidll.saImmOiClassImplementerSet(immOiHandle, className)
def saImmOiClassImplementerRelease(immOiHandle, className):
@@ -223,12 +227,12 @@ def saImmOiClassImplementerRelease(immOi
SaAisErrorT
"""
-
+
oidll.saImmOiClassImplementerRelease.argtypes = [SaImmOiHandleT,
-
SaImmClassNameT]
-
+ SaImmClassNameT]
+
oidll.saImmOiClassImplementerRelease.restype = SaAisErrorT
-
+
return oidll.saImmOiClassImplementerRelease(immOiHandle, className)
def saImmOiObjectImplementerSet(immOiHandle, objectName, scope):
@@ -245,13 +249,13 @@ def saImmOiObjectImplementerSet(immOiHan
SaAisErrorT
"""
-
+
oidll.saImmOiObjectImplementerSet.argtypes = [SaImmOiHandleT,
-
POINTER(SaNameT),
-
SaImmScopeT]
-
+ POINTER(SaNameT),
+ SaImmScopeT]
+
oidll.saImmOiObjectImplementerSet.restype = SaAisErrorT
-
+
return oidll.saImmOiObjectImplementerSet(immOiHandle,
BYREF(objectName),
scope)
@@ -270,13 +274,13 @@ def saImmOiObjectImplementerRelease(immO
SaAisErrorT
"""
-
+
oidll.saImmOiObjectImplementerRelease.argtypes = [SaImmOiHandleT,
-
POINTER(SaNameT),
-
SaImmScopeT]
-
+ POINTER(SaNameT),
+ SaImmScopeT]
+
oidll.saImmOiObjectImplementerRelease.restype = SaAisErrorT
-
+
return oidll.saImmOiObjectImplementerRelease(immOiHandle,
BYREF(objectName),
scope)
@@ -297,10 +301,10 @@ def saImmOiRtObjectCreate_2(immOiHandle,
"""
c_attr_values = marshalNullArray(attrValues)
oidll.saImmOiRtObjectCreate_2.argtypes = [SaImmOiHandleT,
-
SaImmClassNameT,
-
POINTER(SaNameT),
-
POINTER(POINTER(SaImmAttrValuesT_2))]
-
+ SaImmClassNameT,
+ POINTER(SaNameT),
+
POINTER(POINTER(SaImmAttrValuesT_2))]
+
oidll.saImmOiRtObjectCreate_2.restype = SaAisErrorT
return oidll.saImmOiRtObjectCreate_2(immOiHandle,
@@ -321,9 +325,9 @@ def saImmOiRtObjectDelete(immOiHandle, o
"""
oidll.saImmOiRtObjectDelete.argtypes = [SaImmOiHandleT,
-
POINTER(SaNameT)]
+ POINTER(SaNameT)]
oidll.saImmOiRtObjectDelete.restype = SaAisErrorT
-
+
return oidll.saImmOiRtObjectDelete(immOiHandle, BYREF(objectName))
def saImmOiRtObjectUpdate_2(immOiHandle, objectName, attrMods):
@@ -340,11 +344,11 @@ def saImmOiRtObjectUpdate_2(immOiHandle,
"""
c_attr_mods = marshalNullArray(attrMods)
oidll.saImmOiRtObjectUpdate_2.argtypes = [SaImmOiHandleT,
-
POINTER(SaNameT),
-
POINTER(POINTER(SaImmAttrModificationT_2))]
-
+ POINTER(SaNameT),
+
POINTER(POINTER(SaImmAttrModificationT_2))]
+
oidll.saImmOiRtObjectUpdate_2.restype = SaAisErrorT
-
+
return oidll.saImmOiRtObjectUpdate_2(immOiHandle,
BYREF(objectName),
c_attr_mods)
@@ -362,17 +366,17 @@ def saImmOiAdminOperationResult(immOiHan
SaAisErrorT
"""
-
+
oidll.saImmOiAdminOperationResult.argtypes = [SaImmOiHandleT,
-
SaInvocationT,
-
SaAisErrorT]
-
+ SaInvocationT,
+ SaAisErrorT]
+
oidll.saImmOiAdminOperationResult.restype = SaAisErrorT
-
+
return oidll.saImmOiAdminOperationResult(immOiHandle, invocation,
result)
def saImmOiAdminOperationResult_o2(immOiHandle, invocation, result,
-
returnParams):
+ returnParams):
"""Respond to IMM with result of saImmOiAdminOperationCallback()
invoked by IMM.
@@ -386,18 +390,19 @@ def saImmOiAdminOperationResult_o2(immOi
SaAisErrorT
"""
-
+
oidll.saImmOiAdminOperationResult_o2.argtypes = [SaImmOiHandleT,
-
SaInvocationT,
-
SaAisErrorT,
-
POINTER(POINTER(SaImmAdminOperationParamsT_2))]
-
+ SaInvocationT,
+ SaAisErrorT,
+
POINTER(POINTER(SaImmAdminOperationParamsT_2))]
+
oidll.saImmOiAdminOperationResult_o2.restype = SaAisErrorT
-
- return oidll.saImmOiAdminOperationResult_o2(immOiHandle, invocation,
result, BYREF(returnParams))
-def saImmOiAugmentCcbInitialize(immOiHandle, ccbId64, ccbHandle,
- ownerHandle):
+ return oidll.saImmOiAdminOperationResult_o2(immOiHandle, invocation,
+ result,
BYREF(returnParams))
+
+def saImmOiAugmentCcbInitialize(immOiHandle, ccbId64, ccbHandle,
+ ownerHandle):
"""Allows the OI implementers to augment ops to a ccb related
to a current ccb-upcall, before returning from the upcall.
This is allowed inside:
@@ -408,27 +413,28 @@ def saImmOiAugmentCcbInitialize(immOiHan
SaImmOiCcbCompletedCallbackT
SaImmOiApplyCallbackT
SaImmOiAbortCallbackT
-
+
type arguments:
SaImmOiHandleT immOiHandle
SaImmOiCcbIdT ccbId64
SaImmCcbHandleT *ccbHandle
SaImmAdminOwnerHandleT *ownerHandle
-
+
returns:
SaAisErrorT
"""
-
- oidll.saImmOiAugmentCcbInitialize.argtypes = [SaImmOiHandleT,
-
SaImmOiCcbIdT,
-
POINTER(SaImmCcbHandleT),
-
POINTER(SaImmAdminOwnerHandleT)]
+
+ oidll.saImmOiAugmentCcbInitialize.argtypes = [SaImmOiHandleT,
+ SaImmOiCcbIdT,
+ POINTER(SaImmCcbHandleT),
+
POINTER(SaImmAdminOwnerHandleT)]
oidll.saImmOiAugmentCcbInitialize.restype = SaAisErrorT
-
+
return oidll.saImmOiAugmentCcbInitialize(immOiHandle, ccbId64,
-
BYREF(ccbHandle),BYREF(ownerHandle))
-
+ BYREF(ccbHandle),
+ BYREF(ownerHandle))
+
def saImmOiCcbSetErrorString(immOiHandle, ccbId, errorString):
"""Allows the OI implementers to post an error string related
to a current ccb-upcall, before returning from the upcall.
@@ -438,21 +444,21 @@ def saImmOiCcbSetErrorString(immOiHandle
SaImmOiCcbObjectDeleteCallbackT
SaImmOiCcbObjectModifyCallbackT
SaImmOiCcbCompletedCallbackT
-
+
type arguments:
SaImmOiHandleT - immOiHandle
SaImmOiCcbIdT - ccbId
SaStringT - errorString
-
+
returns:
SaAisErrorT
-
+
"""
oidll.saImmOiCcbSetErrorString.argtypes = [SaImmOiHandleT,
-
SaImmOiCcbIdT,
-
SaStringT]
-
+ SaImmOiCcbIdT,
+ SaStringT]
+
oidll.saImmOiCcbSetErrorString.restype = SaAisErrorT
-
+
return oidll.saImmOiCcbSetErrorString(immOiHandle, ccbId, errorString)
diff --git a/python/pyosaf/saImmOm.py b/python/pyosaf/saImmOm.py
--- a/python/pyosaf/saImmOm.py
+++ b/python/pyosaf/saImmOm.py
@@ -262,7 +262,7 @@ def saImmOmSearchInitialize_2(immHandle,
SaAisErrorT
"""
- c_attributeNames = marshalNullArray(attributeNames)
+ c_attributeNames = marshalNullArray(attributeNames)
omdll.saImmOmSearchInitialize_2.argtypes = [SaImmHandleT,
POINTER(SaNameT),
diff --git a/python/pyosaf/saLck.py b/python/pyosaf/saLck.py
--- a/python/pyosaf/saLck.py
+++ b/python/pyosaf/saLck.py
@@ -15,8 +15,9 @@
#
############################################################################
-from ctypes import *
-from saAis import *
+from ctypes import CFUNCTYPE, Structure, CDLL
+from pyosaf.saAis import SaUint64T, Const, SaUint32T, SaEnumT, Enumeration, \
+ BYREF, SaAisErrorT, SaInvocationT
lckdll = CDLL('libSaLck.so.0')
@@ -73,7 +74,7 @@ class SaLckCallbacksT(Structure):
_fields_ = [('saLckResourceOpenCallback', SaLckResourceOpenCallbackT),
('saLckLockGrantCallback', SaLckLockGrantCallbackT),
('saLckLockWaiterCallback', SaLckLockWaiterCallbackT),
- ('saLckResourceUnlockCallback',SaLckResourceUnlockCallbackT )]
+ ('saLckResourceUnlockCallback', SaLckResourceUnlockCallbackT)]
def saLckInitialize(lckHandle, lckCallbacks, version):
"""Register invoking process with Lock Service.
diff --git a/python/pyosaf/saLog.py b/python/pyosaf/saLog.py
--- a/python/pyosaf/saLog.py
+++ b/python/pyosaf/saLog.py
@@ -15,9 +15,13 @@
#
############################################################################
-from ctypes import *
-from saAis import *
-import saNtf
+from ctypes import POINTER, CDLL, Structure, CFUNCTYPE, create_string_buffer, \
+ Union
+from pyosaf.saAis import SaUint64T, Const, SaUint16T, SaVersionT, SaStringT, \
+ SaUint32T, SaBoolT, SaEnumT, Enumeration, SaInvocationT, SaAisErrorT, \
+ BYREF, SaDispatchFlagsT, SaNameT, SaTimeT, SaSelectionObjectT, \
+ SaUint8T, SaSizeT, SaInt8T, SaLimitValueT
+from pyosaf import saNtf
# Only mirrors API calls implemented in osaf/libs/agents/saf/lga/lga_api.c
# If it ain't implemented here, it probably ain't implemented there!
@@ -113,13 +117,13 @@ class SaLogHeaderT(Union):
"""Contain log record header information that is specific to the log
stream for which the log record is destined.
"""
- _fields_ = [('ntfHdr', SaLogNtfLogHeaderT),
+ _fields_ = [('ntfHdr', SaLogNtfLogHeaderT),
('genericHdr', SaLogGenericLogHeaderT)]
class SaLogRecordT(Structure):
"""Contain all information associated with a log record.
"""
- _fields_ = [('logTimeStamp', SaTimeT),
+ _fields_ = [('logTimeStamp', SaTimeT),
('logHdrType', SaLogHeaderTypeT),
('logHeader', SaLogHeaderT),
('logBuffer', POINTER(SaLogBufferT))]
@@ -164,6 +168,11 @@ class SaLogCallbacksT(Structure):
('saLogStreamOpenCallback', SaLogStreamOpenCallbackT),
('saLogWriteLogCallback', SaLogWriteLogCallbackT)]
+SaLogLimitIdT = SaEnumT
+eSaLogLimitIdT = Enumeration((
+ ('SA_LOG_MAX_NUM_CLUSTER_APP_LOG_STREAMS_ID', 1)
+))
+
def saLogInitialize(logHandle, callbacks, version):
"""Register invoking process with Log Service.
@@ -176,7 +185,7 @@ def saLogInitialize(logHandle, callbacks
SaAisErrorT
"""
-
+
logdll.saLogInitialize.argtypes = [POINTER(SaLogHandleT),
POINTER(SaLogCallbacksT),
POINTER(SaVersionT)]
@@ -199,7 +208,7 @@ def saLogSelectionObjectGet(logHandle, s
SaAisErrorT
"""
-
+
logdll.saLogSelectionObjectGet.argtypes = [SaLogHandleT,
POINTER(SaSelectionObjectT)]
@@ -219,7 +228,7 @@ def saLogDispatch(logHandle, dispatchFla
SaAisErrorT
"""
-
+
logdll.saLogDispatch.argtypes = [SaLogHandleT,
SaDispatchFlagsT]
@@ -237,7 +246,7 @@ def saLogFinalize(logHandle):
SaAisErrorT
"""
-
+
logdll.saLogFinalize.argtypes = [SaLogHandleT]
logdll.saLogFinalize.restype = SaAisErrorT
@@ -260,7 +269,7 @@ def saLogStreamOpen_2(logHandle, logStre
SaAisErrorT
"""
-
+
logdll.saLogStreamOpen_2.argtypes = [SaLogHandleT,
POINTER(SaNameT),
POINTER(SaLogFileCreateAttributesT_2),
@@ -292,7 +301,7 @@ def saLogStreamOpenAsync_2(logHandle, lo
SaAisErrorT
"""
-
+
logdll.saLogStreamOpenAsync_2.argtypes = [SaLogHandleT,
POINTER(SaNameT),
POINTER(SaLogFileCreateAttributesT_2),
@@ -319,7 +328,7 @@ def saLogWriteLog(logStreamHandle, timeo
SaAisErrorT
"""
-
+
logdll.saLogWriteLog.argtypes = [SaLogHandleT,
SaTimeT,
POINTER(SaLogRecordT)]
@@ -341,7 +350,7 @@ def saLogWriteLogAsync(logStreamHandle,
SaAisErrorT
"""
-
+
logdll.saLogWriteLogAsync.argtypes = [SaLogStreamHandleT,
SaInvocationT,
SaLogAckFlagsT,
@@ -364,7 +373,7 @@ def saLogStreamClose(logStreamHandle):
SaAisErrorT
"""
-
+
logdll.saLogStreamClose.argtypes = [SaLogStreamHandleT]
logdll.saLogStreamClose.restype = SaAisErrorT
@@ -383,7 +392,7 @@ def saLogLimitGet(logHandle, limitId, li
SaAisErrorT
"""
-
+
logdll.saLogLimitGet.argtypes = [SaLogStreamHandleT,
SaLogLimitIdT,
POINTER(SaLimitValueT)]
diff --git a/python/pyosaf/saMsg.py b/python/pyosaf/saMsg.py
--- a/python/pyosaf/saMsg.py
+++ b/python/pyosaf/saMsg.py
@@ -15,8 +15,10 @@
#
############################################################################
-from ctypes import *
-from saAis import *
+from ctypes import POINTER, CDLL, CFUNCTYPE, Structure
+from pyosaf.saAis import SaUint64T, SaUint32T, Const, BYREF, SaAisErrorT, \
+ SaInvocationT, SaNameT, Enumeration, SaEnumT, SaSizeT, SaUint8T, \
+ SaVoidPtr, SaTimeT
msgdll = CDLL('libSaMsg.so.1')
diff --git a/python/pyosaf/saNtf.py b/python/pyosaf/saNtf.py
--- a/python/pyosaf/saNtf.py
+++ b/python/pyosaf/saNtf.py
@@ -15,15 +15,17 @@
#
############################################################################
-from ctypes import *
-from saAis import *
+from ctypes import POINTER, CFUNCTYPE, Structure, Union, CDLL
+from pyosaf.saAis import SaUint64T, SaEnumT, Enumeration, Const, BYREF, \
+ SaUint32T, SaUint16T, SaBoolT, SaStringT, SaNameT, SaTimeT, SaDoubleT,
\
+ SaInt64T, SaUint8T, SaInt8T, SaInt16T, SaInt32T, SaFloatT
ntfdll = CDLL('libSaNtf.so.0')
SaNtfHandleT = SaUint64T
SaNtfNotificationHandleT = SaUint64T
-SaNtfNotificationFilterHandleT = SaUint64T
-SaNtfReadHandleT = SaUint64T
+SaNtfNotificationFilterHandleT = SaUint64T
+SaNtfReadHandleT = SaUint64T
SaNtfNotificationTypeT = SaEnumT
eSaNtfNotificationTypeT = Enumeration((
@@ -65,13 +67,13 @@ eSaNtfEventTypeT = Enumeration((
'SA_NTF_ALARM_EQUIPMENT',
'SA_NTF_ALARM_ENVIRONMENT',
- ('SA_NTF_SECURITY_ALARM_NOTIFICATIONS_START',
+ ('SA_NTF_SECURITY_ALARM_NOTIFICATIONS_START',
eSaNtfNotificationTypeT.SA_NTF_TYPE_SECURITY_ALARM),
'SA_NTF_INTEGRITY_VIOLATION',
'SA_NTF_OPERATION_VIOLATION',
'SA_NTF_PHYSICAL_VIOLATION',
'SA_NTF_SECURITY_SERVICE_VIOLATION',
- 'SA_NTF_TIME_VIOLATION',
+ 'SA_NTF_TIME_VIOLATION',
('SA_NTF_MISCELLANEOUS_NOTIFICATIONS_START',
eSaNtfNotificationTypeT.SA_NTF_TYPE_MISCELLANEOUS),
@@ -132,7 +134,7 @@ saNtf.SA_NTF_HPI_EVENT_FUMI_BIT = 0x8000
saNtf.SA_NTF_HPI_EVENT_OTHER_BIT = 0x10000000
saNtf.SA_NTF_APPLICATION_EVENT_BIT = 0x100000000000
-SaNtfEventTypeBitmapT = SaUint64T
+SaNtfEventTypeBitmapT = SaUint64T
class SaNtfClassIdT(Structure):
"""Contain unique identifier for the situation that triggered
@@ -144,7 +146,7 @@ class SaNtfClassIdT(Structure):
saNtf.SA_NTF_VENDOR_ID_SAF = 18568
-SaNtfElementIdT = SaUint16T
+SaNtfElementIdT = SaUint16T
SaNtfIdentifierT = SaUint64T
saNtf.SA_NTF_IDENTIFIER_UNUSED = 0
@@ -474,11 +476,11 @@ class SaNtfMiscellaneousNotificationT(St
"""Contain pointers to the fields in a miscellaneous notification.
"""
_fields_ = [('notificationHandle', SaNtfNotificationHandleT),
- ('notificationHeader', SaNtfNotificationHeaderT )]
+ ('notificationHeader', SaNtfNotificationHeaderT)]
saNtf.SA_NTF_ALLOC_SYSTEM_LIMIT = -1
-SaNtfSubscriptionIdT = SaUint32T
+SaNtfSubscriptionIdT = SaUint32T
class SaNtfNotificationFilterHeaderT(Structure):
"""Contain filter elements common to all notification types.
@@ -554,8 +556,8 @@ class SaNtfSecurityAlarmNotificationFilt
"""
_fields_ = [('notificationFilterHandle',
SaNtfNotificationFilterHandleT),
- ('notificationFilterHeader',SaNtfNotificationFilterHeaderT ),
- ('numProbableCauses',SaUint16T ),
+ ('notificationFilterHeader', SaNtfNotificationFilterHeaderT),
+ ('numProbableCauses', SaUint16T),
('numSeverities', SaUint16T),
('numSecurityAlarmDetectors', SaUint16T),
('numServiceUsers', SaUint16T),
@@ -724,7 +726,7 @@ class SaNtfCallbacksT_2(Structure):
SaNtfStaticSuppressionFilterSetCallbackT_3 = CFUNCTYPE(None,
SaNtfHandleT, SaNtfEventTypeBitmapT)
-
+
SaNtfNotificationCallbackT_3 = CFUNCTYPE(None,
SaNtfSubscriptionIdT, POINTER(SaNtfNotificationsT_3))
@@ -1038,7 +1040,7 @@ def saNtfStateChangeNotificationAllocate
numStateChanges,
variableDataSize)
#endif /* SA_NTF_A01 || SA_NTF_A02 */
-
+
def saNtfStateChangeNotificationAllocate_3(ntfHandle,
notification,
numCorrelatedNotifications,
@@ -1608,7 +1610,7 @@ def saNtfNotificationReadNext_3(readHand
return ntfdll.saNtfNotificationReadNext_3(readHandle,
searchDirection,
BYREF(notification))
-
+
def saNtfNotificationReadFinalize(readHandle):
"""Release resources bound to the read handle.
diff --git a/python/pyosaf/saSmf.py b/python/pyosaf/saSmf.py
--- a/python/pyosaf/saSmf.py
+++ b/python/pyosaf/saSmf.py
@@ -15,8 +15,9 @@
#
############################################################################
-from ctypes import *
-from saAis import *
+from ctypes import CDLL, POINTER, Structure, CFUNCTYPE
+from pyosaf.saAis import SaUint64T, SaUint32T, SaEnumT, Enumeration, BYREF, \
+ SaSizeT, SaStringT, SaInvocationT, SaNameT, SaUint8T
# Only mirrors API calls implemented in osaf/libs/agents/saf/smfa/smfa_api.c
# If it ain't implemented here (or is commented out here),
diff --git a/python/pyosaf/utils/immom/ccb.py b/python/pyosaf/utils/immom/ccb.py
--- a/python/pyosaf/utils/immom/ccb.py
+++ b/python/pyosaf/utils/immom/ccb.py
@@ -18,15 +18,12 @@
Class representing an IMM CCB.
'''
-import time
from ctypes import c_void_p, pointer, cast
from pyosaf.saAis import eSaAisErrorT, SaNameT, SaStringT, \
- SaDoubleT, SaTimeT, SaUint64T, SaInt64T, SaUint32T, SaInt32T, SaFloatT, \
- marshalNullArray
+ SaDoubleT, SaTimeT, SaUint64T, SaInt64T, SaUint32T, SaInt32T, SaFloatT
-from pyosaf.saImm import eSaImmScopeT, eSaImmValueTypeT, SaImmAttrValuesT_2, \
- SaImmValueTypeMap
+from pyosaf.saImm import eSaImmScopeT, eSaImmValueTypeT, SaImmAttrValuesT_2
from pyosaf import saImm
from pyosaf import saImmOm
@@ -71,12 +68,14 @@ def marshal_c_array(value_type, value_li
return c_array
class Ccb(object):
+ ''' Represents an ongoing CCB '''
+
def __init__(self, flags=[saImm.saImm.SA_IMM_CCB_REGISTERED_OI]):
self.owner_handle = saImmOm.SaImmAdminOwnerHandleT()
owner_name = saImmOm.SaImmAdminOwnerNameT("DummyName")
- err = immom.saImmOmAdminOwnerInitialize(immom.HANDLE, owner_name,
+ immom.saImmOmAdminOwnerInitialize(immom.HANDLE, owner_name,
saAis.eSaBoolT.SA_TRUE, self.owner_handle)
self.ccb_handle = saImmOm.SaImmCcbHandleT()
@@ -86,12 +85,12 @@ class Ccb(object):
else:
ccb_flags = saImmOm.SaImmCcbFlagsT(0)
- err = immom.saImmOmCcbInitialize(self.owner_handle, ccb_flags,
- self.ccb_handle)
+ immom.saImmOmCcbInitialize(self.owner_handle, ccb_flags,
+ self.ccb_handle)
def __enter__(self):
''' Called when Ccb is used in a with statement:
-
+
with Ccb() as ccb:
...
@@ -99,28 +98,28 @@ class Ccb(object):
'''
return self
- def __exit__(self, type, value, traceback):
- ''' Called when Ccb is used in a with statement,
- just before it exits
+ def __exit__(self, exit_type, value, traceback):
+ ''' Called when Ccb is used in a with statement,
+ just before it exits
- type, value and traceback are only set if the with
+ exit_type, value and traceback are only set if the with
statement was left via an exception
'''
- if type or value or traceback:
+ if exit_type or value or traceback:
self.__del__()
else:
self.apply()
self.__del__()
def __del__(self):
- error = immom.saImmOmAdminOwnerFinalize(self.owner_handle)
+ immom.saImmOmAdminOwnerFinalize(self.owner_handle)
def create(self, obj, _parent_name=None):
''' add to the CCB the object 'obj' '''
if _parent_name is not None:
parent_name = SaNameT(_parent_name)
object_names = [parent_name]
- err = immom.saImmOmAdminOwnerSet(self.owner_handle, object_names,
+ immom.saImmOmAdminOwnerSet(self.owner_handle, object_names,
eSaImmScopeT.SA_IMM_SUBTREE)
else:
parent_name = None
@@ -135,22 +134,25 @@ class Ccb(object):
attr.attrValues = marshal_c_array(attr.attrValueType, values)
attr_values.append(attr)
- err = immom.saImmOmCcbObjectCreate_2(self.ccb_handle,
- obj.class_name,
- parent_name,
- attr_values)
+ immom.saImmOmCcbObjectCreate_2(self.ccb_handle,
+ obj.class_name,
+ parent_name,
+ attr_values)
def delete(self, _object_name):
+ ''' Adds a delete operation of the object with the given DN to the
+ CCB'''
+
if _object_name is None:
raise SafException(eSaAisErrorT.SA_AIS_ERR_NOT_EXIST)
object_name = SaNameT(_object_name)
object_names = [object_name]
- err = immom.saImmOmAdminOwnerSet(self.owner_handle, object_names,
- eSaImmScopeT.SA_IMM_SUBTREE)
+ immom.saImmOmAdminOwnerSet(self.owner_handle, object_names,
+ eSaImmScopeT.SA_IMM_SUBTREE)
- err = immom.saImmOmCcbObjectDelete(self.ccb_handle, object_name)
+ immom.saImmOmCcbObjectDelete(self.ccb_handle, object_name)
def modify_value_add(self, object_name, attr_name, values):
''' add to the CCB an ADD modification of an existing object '''
@@ -282,19 +284,22 @@ class Ccb(object):
attr_mods.append(attr_mod)
- err = immom.saImmOmCcbObjectModify_2(self.ccb_handle,
- object_names[0], attr_mods)
+ immom.saImmOmCcbObjectModify_2(self.ccb_handle,
+ object_names[0], attr_mods)
def apply(self):
''' Apply the CCB '''
- err = immom.saImmOmCcbApply(self.ccb_handle)
+ immom.saImmOmCcbApply(self.ccb_handle)
def test():
+ ''' Small test case to show how the Ccb class can be used'''
+
ccb = Ccb()
- ccb.modify("safAmfCluster=myAmfCluster", "saAmfClusterStartupTimeout",
- 10000000000)
+ ccb.modify_value_replace("safAmfCluster=myAmfCluster",
+ "saAmfClusterStartupTimeout",
+ [10000000000])
ccb.apply()
del ccb
diff --git a/python/pyosaf/utils/immom/iterator.py
b/python/pyosaf/utils/immom/iterator.py
--- a/python/pyosaf/utils/immom/iterator.py
+++ b/python/pyosaf/utils/immom/iterator.py
@@ -20,7 +20,6 @@ IMM Search iterators
'''
import sys
-import time
import collections
from ctypes import pointer, c_char_p, cast, c_void_p
@@ -63,11 +62,11 @@ class SearchIterator(collections.Iterato
search_param = _search_param
try:
- err = immom.saImmOmSearchInitialize_2(immom.HANDLE,
- self.root_name, self.scope,
- search_options,
search_param,
- self.attribute_names,
- self.search_handle)
+ immom.saImmOmSearchInitialize_2(immom.HANDLE,
+ self.root_name, self.scope,
+ search_options, search_param,
+ self.attribute_names,
+ self.search_handle)
except SafException as err:
if err.value == eSaAisErrorT.SA_AIS_ERR_NOT_EXIST:
self.search_handle = None
@@ -77,7 +76,7 @@ class SearchIterator(collections.Iterato
def __del__(self):
if self.search_handle is not None:
- error = immom.saImmOmSearchFinalize(self.search_handle)
+ immom.saImmOmSearchFinalize(self.search_handle)
def __iter__(self):
return self
@@ -86,8 +85,8 @@ class SearchIterator(collections.Iterato
name = SaNameT()
attributes = pointer(pointer(SaImmAttrValuesT_2()))
try:
- error = immom.saImmOmSearchNext_2(self.search_handle, name,
- attributes)
+ immom.saImmOmSearchNext_2(self.search_handle, name,
+ attributes)
except SafException as err:
if err.value == eSaAisErrorT.SA_AIS_ERR_NOT_EXIST:
raise StopIteration
diff --git a/python/pyosaf/utils/immom/object.py
b/python/pyosaf/utils/immom/object.py
--- a/python/pyosaf/utils/immom/object.py
+++ b/python/pyosaf/utils/immom/object.py
@@ -20,7 +20,6 @@
'''
from pyosaf.saImm import saImm
-from pyosaf import saImmOm
import pyosaf.utils.immom
diff --git a/python/pyosaf/utils/log/logger.py
b/python/pyosaf/utils/log/logger.py
--- a/python/pyosaf/utils/log/logger.py
+++ b/python/pyosaf/utils/log/logger.py
@@ -38,11 +38,11 @@ class SafLogger(object):
self.callbacks.saLogWriteLogCallback = \
saLog.SaLogWriteLogCallbackT(self.writeLogCallback)
- log.saLogInitialize(self.logHandle, self.callbacks,
log.LOG_VERSION)
- log.saLogSelectionObjectGet(self.logHandle, self.fd)
+ log.saLogInitialize(self.logHandle, self.callbacks,
log.LOG_VERSION)
+ log.saLogSelectionObjectGet(self.logHandle, self.fd)
streamName = saAis.SaNameT(saLog.saLog.SA_LOG_STREAM_SYSTEM)
- log.saLogStreamOpen_2(self.logHandle, streamName, None, 0,
+ log.saLogStreamOpen_2(self.logHandle, streamName, None, 0,
saAis.saAis.SA_TIME_ONE_SECOND,
self.streamHandle)
userName = ctypes.pointer(saAis.SaNameT(exec_name))
@@ -60,17 +60,17 @@ class SafLogger(object):
return self.invocation
def __del__(self):
- self.finalize()
+ self.finalize()
def log(self, logstr):
log_buffer = ctypes.pointer(saLog.SaLogBufferT(logstr))
notice = saLog.saLog.SA_LOG_SEV_NOTICE
self.record.logBuffer = log_buffer
self.record.logHeader.genericHdr.logSeverity = notice
- log.saLogWriteLogAsync(self.streamHandle,
+ log.saLogWriteLogAsync(self.streamHandle,
self.get_invocation(),
saLog.saLog.SA_LOG_RECORD_WRITE_ACK,
self.record)
def dispatch(self, readfds):
if self.fd.value in readfds:
- log.saLogDispatch(self.logHandle,
saAis.eSaDispatchFlagsT.SA_DISPATCH_ALL)
+ log.saLogDispatch(self.logHandle,
saAis.eSaDispatchFlagsT.SA_DISPATCH_ALL)
diff --git a/samples/immsv/immom_python/immom.py
b/samples/immsv/immom_python/immom.py
--- a/samples/immsv/immom_python/immom.py
+++ b/samples/immsv/immom_python/immom.py
@@ -42,7 +42,7 @@ immom -- An IMM Object Manager in Python
"SA_AIS_ERR_REPAIR_PENDING",
"SA_AIS_ERR_NO_BINDINGS",
"SA_AIS_ERR_UNAVAILABLE"
-
+
"""
import sys
@@ -76,10 +76,10 @@ def _flag_parse(l):
return f
def _get_rdn_attr(class_name):
- (c,a) = getclass(class_name)
- for (n,t,f,l) in a:
+ (c, a) = getclass(class_name)
+ for (n, t, f, l) in a:
if 'RDN' in f:
- return (n,t)
+ return (n, t)
def split_dn(dn):
"""Split a distinguish (dn) name into a tuple; (rdn,parent)
@@ -88,12 +88,12 @@ def split_dn(dn):
('ref=one=1\\,two=2\\,three=3', 'top=1')
"""
dnitems = dn.split(',')
- i=0
+ i = 0
while dnitems[i][-1] == '\\':
i = i+1
rdn = ','.join(dnitems[:i+1])
parent = ','.join(dnitems[i+1:])
- return (rdn,parent)
+ return (rdn, parent)
def getclass(name):
"""Get IMM Class Information.
@@ -117,14 +117,14 @@ def getclass(name):
'RUNTIME' | 'PERSISTENT' | 'CACHED'
"""
- (c,a) = immombin.saImmOmClassDescriptionGet(name)
- return (c, [(n,t,_flag_list(f),l) for (n,t,f,l) in a])
+ (c, a) = immombin.saImmOmClassDescriptionGet(name)
+ return (c, [(n, t, _flag_list(f), l) for (n, t, f, l) in a])
def getclassnames():
"""Returns a list of all defined IMM classes.
"""
dn='opensafImm=opensafImm,safApp=safImmService'
- for (n,t,v) in immombin.saImmOmAccessorGet(dn):
+ for (n, t, v) in immombin.saImmOmAccessorGet(dn):
if n == 'opensafImmClassNames':
return v
@@ -135,7 +135,7 @@ def createclass(name, category, attrs):
NOTE: Default values are not yet implemented.
"""
- attrs = [ (n,t,_flag_parse(f),l) for (n,t,f,l) in attrs
+ attrs = [ (n, t, _flag_parse(f), l) for (n, t, f, l) in attrs
if not n.startswith('SaImm') ]
immombin.saImmOmClassCreate(name, category, attrs)
@@ -175,7 +175,7 @@ def getinstanceof(dn, classname):
def classof(dn):
"""Get the class of an object.
"""
- for (n,t,v) in getobject(dn):
+ for (n, t, v) in getobject(dn):
if n == 'SaImmAttrClassName':
return v[0]
@@ -192,7 +192,7 @@ def getattributes(dn):
a convenient dictionary. The type info is however lost.
"""
a = dict()
- for (n,t,v) in immombin.saImmOmAccessorGet(dn):
+ for (n, t, v) in immombin.saImmOmAccessorGet(dn):
a[n] = v
return a
@@ -238,9 +238,9 @@ def createobject(dn, class_name, attr_li
attribute will be created automatically and shall not be included
in the attr_list. Any "SaImm*" and RDN attributes will be ignored.
"""
- (rdn,parent) = split_dn(dn)
- (rdn_attr,rdn_type) = _get_rdn_attr(class_name)
- attr_list = filter(lambda (n,t,v):
+ (rdn, parent) = split_dn(dn)
+ (rdn_attr, rdn_type) = _get_rdn_attr(class_name)
+ attr_list = filter(lambda (n, t, v):
not n.startswith('SaImm') and n != rdn_attr, attr_list)
attr_list.append( (rdn_attr, rdn_type, [ rdn ]) )
if parent:
@@ -251,7 +251,7 @@ def copyobject(src_dn, dst_dn):
"""Copy an IMM object.
"""
attr_list = getobject(src_dn)
- for (n,t,v) in attr_list:
+ for (n, t, v) in attr_list:
if n == 'SaImmAttrClassName':
class_name = v[0]
break
@@ -262,7 +262,7 @@ def modifyobject(dn, attr_list):
Any "SaImm*" attributes will be ignored.
"""
#immombin.saImmOmAdminOwnerSet('SA_IMM_ONE', [dn])
- attr_list = filter(lambda (n,t,v):
+ attr_list = filter(lambda (n, t, v):
not n.startswith('SaImm'), attr_list)
immombin.saImmOmCcbObjectModify(dn, attr_list)
@@ -315,15 +315,15 @@ def _dumpclassattr(n, t, f, d):
def dumpclass(cn):
"""Dump a class in imm-xml format.
"""
- (c,a) = getclass(cn)
+ (c, a) = getclass(cn)
print ' <class name="%s">' % cn
print ' <category>SA_%s</category>' % c
- for (n,t,f,d) in a:
- _dumpclassattr(n,t,f,d)
+ for (n, t, f, d) in a:
+ _dumpclassattr(n, t, f, d)
print ' </class>'
def _getaflags(ca, attr):
- for (n,t,f,d) in ca:
+ for (n, t, f, d) in ca:
if n == attr:
return f
@@ -338,7 +338,7 @@ def dumpobj(dn):
print ' <object class="%s">' % c
print ' <dn>%s</dn>' % dn
- for (k,v) in a.iteritems():
+ for (k, v) in a.iteritems():
if k.startswith('Sa') or not v:
continue
f = _getaflags(ax, k)
diff --git a/samples/immsv/immom_python/immomexamples.py
b/samples/immsv/immom_python/immomexamples.py
--- a/samples/immsv/immom_python/immomexamples.py
+++ b/samples/immsv/immom_python/immomexamples.py
@@ -7,7 +7,7 @@ import immom
def getimplementer(dn):
"""Returns the implmenter of an object or '' if there are no implementer.
"""
- for (n,t,v) in immom.getobject(dn):
+ for (n, t, v) in immom.getobject(dn):
if n == 'SaImmAttrImplementerName':
if v:
return v[0]
@@ -26,7 +26,7 @@ def getimplementers():
def getadminowner(dn):
"""Returns the adminowner of an object or '' if there are no adminowner.
"""
- for (n,t,v) in immom.getobject(dn):
+ for (n, t, v) in immom.getobject(dn):
if n == 'SaImmAttrAdminOwnerName':
if v:
return v[0]
@@ -37,7 +37,7 @@ def runtimeclasses():
"""
rtset = set()
for cn in immom.getclassnames():
- (c,a) = immom.getclass(cn)
+ (c, a) = immom.getclass(cn)
if c == 'RUNTIME':
rtset.add(cn)
return rtset
@@ -54,8 +54,8 @@ def configrtclasses():
"""
rtset = set()
for cn in configclasses():
- (c,a) = immom.getclass(cn)
- for (n,t,f,d) in a:
+ (c, a) = immom.getclass(cn)
+ for (n, t, f, d) in a:
if 'RUNTIME' in f:
rtset.add(cn)
return rtset
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
