diff options
-rw-r--r-- | mof/60_LMI_PowerManagement.mof | 5 | ||||
-rw-r--r-- | src/power/LMI_PowerConcreteJobProvider.c (renamed from src/power/LMI_ConcreteJobProvider.c) | 72 |
2 files changed, 40 insertions, 37 deletions
diff --git a/mof/60_LMI_PowerManagement.mof b/mof/60_LMI_PowerManagement.mof index 7657818..f1b9ee9 100644 --- a/mof/60_LMI_PowerManagement.mof +++ b/mof/60_LMI_PowerManagement.mof @@ -55,6 +55,11 @@ class LMI_HostedPowerManagementService: CIM_HostedService }; [ Provider("cmpi:cmpiLMI_PowerManagement") ] +class LMI_PowerConcreteJob: CIM_ConcreteJob +{ +}; + +[ Provider("cmpi:cmpiLMI_PowerManagement") ] class LMI_ElementCapabilities: CIM_ElementCapabilities { [ Key, Min(1), Description("The managed element.") ] diff --git a/src/power/LMI_ConcreteJobProvider.c b/src/power/LMI_PowerConcreteJobProvider.c index 4841852..a72a868 100644 --- a/src/power/LMI_ConcreteJobProvider.c +++ b/src/power/LMI_PowerConcreteJobProvider.c @@ -20,24 +20,24 @@ #include <konkret/konkret.h> #include <stdint.h> -#include "LMI_ConcreteJob.h" +#include "LMI_PowerConcreteJob.h" #include "globals.h" static const CMPIBroker* _cb = NULL; #include "power.h" -static void LMI_ConcreteJobInitializeInstance(CMPIInstanceMI *mi) +static void LMI_PowerConcreteJobInitializeInstance(CMPIInstanceMI *mi) { mi->hdl = power_ref(_cb); } -static void LMI_ConcreteJobInitializeMethod(CMPIMethodMI *mi) +static void LMI_PowerConcreteJobInitializeMethod(CMPIMethodMI *mi) { mi->hdl = power_ref(_cb); } -static CMPIStatus LMI_ConcreteJobCleanup( +static CMPIStatus LMI_PowerConcreteJobCleanup( CMPIInstanceMI* mi, const CMPIContext* cc, CMPIBoolean term) @@ -50,7 +50,7 @@ static CMPIStatus LMI_ConcreteJobCleanup( CMReturn(CMPI_RC_OK); } -static CMPIStatus LMI_ConcreteJobEnumInstanceNames( +static CMPIStatus LMI_PowerConcreteJobEnumInstanceNames( CMPIInstanceMI* mi, const CMPIContext* cc, const CMPIResult* cr, @@ -60,7 +60,7 @@ static CMPIStatus LMI_ConcreteJobEnumInstanceNames( _cb, mi, cc, cr, cop); } -static CMPIStatus LMI_ConcreteJobEnumInstances( +static CMPIStatus LMI_PowerConcreteJobEnumInstances( CMPIInstanceMI* mi, const CMPIContext* cc, const CMPIResult* cr, @@ -75,11 +75,11 @@ static CMPIStatus LMI_ConcreteJobEnumInstances( while (plist) { powerStateChangeJob = plist->data; - LMI_ConcreteJob concreteJob; - LMI_ConcreteJob_Init(&concreteJob, _cb, ns); - LMI_ConcreteJob_Set_InstanceID(&concreteJob, "LMI_PowerStateChange_ConcreteJob:123"); // TODO: unique ID - LMI_ConcreteJob_Set_JobState(&concreteJob, job_state(powerStateChangeJob)); - LMI_ConcreteJob_Set_TimeOfLastStateChange(&concreteJob, CMNewDateTimeFromBinary(_cb, ((uint64_t) job_timeOfLastChange(powerStateChangeJob)) * 1000000, 0, &status)); + LMI_PowerConcreteJob concreteJob; + LMI_PowerConcreteJob_Init(&concreteJob, _cb, ns); + LMI_PowerConcreteJob_Set_InstanceID(&concreteJob, "LMI_PowerStateChange_ConcreteJob:123"); // TODO: unique ID + LMI_PowerConcreteJob_Set_JobState(&concreteJob, job_state(powerStateChangeJob)); + LMI_PowerConcreteJob_Set_TimeOfLastStateChange(&concreteJob, CMNewDateTimeFromBinary(_cb, ((uint64_t) job_timeOfLastChange(powerStateChangeJob)) * 1000000, 0, &status)); //LMI_ConcreteJob_Set_ KReturnInstance(cr, concreteJob); plist = g_list_next(plist); @@ -88,7 +88,7 @@ static CMPIStatus LMI_ConcreteJobEnumInstances( CMReturn(CMPI_RC_OK); } -static CMPIStatus LMI_ConcreteJobGetInstance( +static CMPIStatus LMI_PowerConcreteJobGetInstance( CMPIInstanceMI* mi, const CMPIContext* cc, const CMPIResult* cr, @@ -99,18 +99,17 @@ static CMPIStatus LMI_ConcreteJobGetInstance( _cb, mi, cc, cr, cop, properties); } -static CMPIStatus LMI_ConcreteJobCreateInstance( +static CMPIStatus LMI_PowerConcreteJobCreateInstance( CMPIInstanceMI* mi, const CMPIContext* cc, const CMPIResult* cr, const CMPIObjectPath* cop, const CMPIInstance* ci) { - CMReturn(CMPI_RC_ERR_NOT_SUPPORTED); } -static CMPIStatus LMI_ConcreteJobModifyInstance( +static CMPIStatus LMI_PowerConcreteJobModifyInstance( CMPIInstanceMI* mi, const CMPIContext* cc, const CMPIResult* cr, @@ -121,7 +120,7 @@ static CMPIStatus LMI_ConcreteJobModifyInstance( CMReturn(CMPI_RC_ERR_NOT_SUPPORTED); } -static CMPIStatus LMI_ConcreteJobDeleteInstance( +static CMPIStatus LMI_PowerConcreteJobDeleteInstance( CMPIInstanceMI* mi, const CMPIContext* cc, const CMPIResult* cr, @@ -130,7 +129,7 @@ static CMPIStatus LMI_ConcreteJobDeleteInstance( CMReturn(CMPI_RC_ERR_NOT_SUPPORTED); } -static CMPIStatus LMI_ConcreteJobExecQuery( +static CMPIStatus LMI_PowerConcreteJobExecQuery( CMPIInstanceMI* mi, const CMPIContext* cc, const CMPIResult* cr, @@ -142,21 +141,20 @@ static CMPIStatus LMI_ConcreteJobExecQuery( } CMInstanceMIStub( - LMI_ConcreteJob, - LMI_ConcreteJob, + LMI_PowerConcreteJob, + LMI_PowerConcreteJob, _cb, - LMI_ConcreteJobInitializeInstance(&mi)) + LMI_PowerConcreteJobInitializeInstance(&mi)) -static CMPIStatus LMI_ConcreteJobMethodCleanup( +static CMPIStatus LMI_PowerConcreteJobMethodCleanup( CMPIMethodMI* mi, const CMPIContext* cc, CMPIBoolean term) { - power_unref(mi->hdl); CMReturn(CMPI_RC_OK); } -static CMPIStatus LMI_ConcreteJobInvokeMethod( +static CMPIStatus LMI_PowerConcreteJobInvokeMethod( CMPIMethodMI* mi, const CMPIContext* cc, const CMPIResult* cr, @@ -165,21 +163,21 @@ static CMPIStatus LMI_ConcreteJobInvokeMethod( const CMPIArgs* in, CMPIArgs* out) { - return LMI_ConcreteJob_DispatchMethod( + return LMI_PowerConcreteJob_DispatchMethod( _cb, mi, cc, cr, cop, meth, in, out); } CMMethodMIStub( - LMI_ConcreteJob, - LMI_ConcreteJob, + LMI_PowerConcreteJob, + LMI_PowerConcreteJob, _cb, - LMI_ConcreteJobInitializeMethod(&mi)) + LMI_PowerConcreteJobInitializeMethod(&mi)) -KUint32 LMI_ConcreteJob_KillJob( +KUint32 LMI_PowerConcreteJob_KillJob( const CMPIBroker* cb, CMPIMethodMI* mi, const CMPIContext* context, - const LMI_ConcreteJobRef* self, + const LMI_PowerConcreteJobRef* self, const KBoolean* DeleteOnKill, CMPIStatus* status) { @@ -189,11 +187,11 @@ KUint32 LMI_ConcreteJob_KillJob( return result; } -KUint32 LMI_ConcreteJob_RequestStateChange( +KUint32 LMI_PowerConcreteJob_RequestStateChange( const CMPIBroker* cb, CMPIMethodMI* mi, const CMPIContext* context, - const LMI_ConcreteJobRef* self, + const LMI_PowerConcreteJobRef* self, const KUint16* RequestedState, const KDateTime* TimeoutPeriod, CMPIStatus* status) @@ -204,11 +202,11 @@ KUint32 LMI_ConcreteJob_RequestStateChange( return result; } -KUint32 LMI_ConcreteJob_GetError( +KUint32 LMI_PowerConcreteJob_GetError( const CMPIBroker* cb, CMPIMethodMI* mi, const CMPIContext* context, - const LMI_ConcreteJobRef* self, + const LMI_PowerConcreteJobRef* self, KString* Error, CMPIStatus* status) { @@ -218,11 +216,11 @@ KUint32 LMI_ConcreteJob_GetError( return result; } -KUint32 LMI_ConcreteJob_GetErrors( +KUint32 LMI_PowerConcreteJob_GetErrors( const CMPIBroker* cb, CMPIMethodMI* mi, const CMPIContext* context, - const LMI_ConcreteJobRef* self, + const LMI_PowerConcreteJobRef* self, KStringA* Errors, CMPIStatus* status) { @@ -234,6 +232,6 @@ KUint32 LMI_ConcreteJob_GetErrors( KONKRET_REGISTRATION( "root/cimv2", - "LMI_ConcreteJob", - "LMI_ConcreteJob", + "LMI_PowerConcreteJob", + "LMI_PowerConcreteJob", "instance method") |