Rename HostedService classes to avoid duplication

Both Power and Account providers defined LMI_HostedService class. It
confuses sfcbd daemon, so the classes has been renamed based on which
service they provide (HostedPowerManagementService and
HostedAccountManagementService).

2 files changed, 62 insertions, 62 deletions

diff --git a/src/account/LMI_HostedServiceProvider.c b/src/account/LMI_HostedAccountManagementServiceProvider.c
index 48a7b6b..aad981d 100644
--- a/src/account/LMI_HostedServiceProvider.c
+++ b/src/account/LMI_HostedAccountManagementServiceProvider.c
@@ -1,5 +1,5 @@
 #include <konkret/konkret.h>
-#include "LMI_HostedService.h"
+#include "LMI_HostedAccountManagementService.h"
 #include "CIM_ComputerSystem.h"
 #include "LMI_AccountManagementService.h"
 
@@ -8,11 +8,11 @@
 
 static const CMPIBroker* _cb;
 
-static void LMI_HostedServiceInitialize()
+static void LMI_HostedAccountManagementServiceInitialize()
 {
 }
 
-static CMPIStatus LMI_HostedServiceCleanup( 
+static CMPIStatus LMI_HostedAccountManagementServiceCleanup(
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term)
@@ -20,7 +20,7 @@ static CMPIStatus LMI_HostedServiceCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus LMI_HostedServiceEnumInstanceNames( 
+static CMPIStatus LMI_HostedAccountManagementServiceEnumInstanceNames(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -30,7 +30,7 @@ static CMPIStatus LMI_HostedServiceEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus LMI_HostedServiceEnumInstances( 
+static CMPIStatus LMI_HostedAccountManagementServiceEnumInstances(
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -39,7 +39,7 @@ static CMPIStatus LMI_HostedServiceEnumInstances(
 {
     CIM_ComputerSystemRef lcsref;
     LMI_AccountManagementServiceRef lamsref;
-    LMI_HostedService lhs;
+    LMI_HostedAccountManagementService lhs;
 
     CMPIObjectPath *computerSystemOP = NULL;
     CMPIStatus rc;
@@ -64,15 +64,15 @@ static CMPIStatus LMI_HostedServiceEnumInstances(
     LMI_AccountManagementServiceRef_Set_CreationClassName(&lamsref,
       LMI_AccountManagementService_ClassName);
 
-    LMI_HostedService_Init(&lhs, _cb, nameSpace);
-    LMI_HostedService_SetObjectPath_Antecedent(&lhs, computerSystemOP);
-    LMI_HostedService_Set_Dependent(&lhs, &lamsref);
+    LMI_HostedAccountManagementService_Init(&lhs, _cb, nameSpace);
+    LMI_HostedAccountManagementService_SetObjectPath_Antecedent(&lhs, computerSystemOP);
+    LMI_HostedAccountManagementService_Set_Dependent(&lhs, &lamsref);
 
     KReturnInstance(cr, lhs);
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus LMI_HostedServiceGetInstance( 
+static CMPIStatus LMI_HostedAccountManagementServiceGetInstance(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc,
     const CMPIResult* cr, 
@@ -83,7 +83,7 @@ static CMPIStatus LMI_HostedServiceGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus LMI_HostedServiceCreateInstance( 
+static CMPIStatus LMI_HostedAccountManagementServiceCreateInstance(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -93,7 +93,7 @@ static CMPIStatus LMI_HostedServiceCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus LMI_HostedServiceModifyInstance( 
+static CMPIStatus LMI_HostedAccountManagementServiceModifyInstance(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -104,7 +104,7 @@ static CMPIStatus LMI_HostedServiceModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus LMI_HostedServiceDeleteInstance( 
+static CMPIStatus LMI_HostedAccountManagementServiceDeleteInstance(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -113,7 +113,7 @@ static CMPIStatus LMI_HostedServiceDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus LMI_HostedServiceExecQuery(
+static CMPIStatus LMI_HostedAccountManagementServiceExecQuery(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -124,7 +124,7 @@ static CMPIStatus LMI_HostedServiceExecQuery(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus LMI_HostedServiceAssociationCleanup( 
+static CMPIStatus LMI_HostedAccountManagementServiceAssociationCleanup(
     CMPIAssociationMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term) 
@@ -132,7 +132,7 @@ static CMPIStatus LMI_HostedServiceAssociationCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus LMI_HostedServiceAssociators(
+static CMPIStatus LMI_HostedAccountManagementServiceAssociators(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -149,7 +149,7 @@ static CMPIStatus LMI_HostedServiceAssociators(
         cc,
         cr,
         cop,
-        LMI_HostedService_ClassName,
+        LMI_HostedAccountManagementService_ClassName,
         assocClass,
         resultClass,
         role,
@@ -157,7 +157,7 @@ static CMPIStatus LMI_HostedServiceAssociators(
         properties);
 }
 
-static CMPIStatus LMI_HostedServiceAssociatorNames(
+static CMPIStatus LMI_HostedAccountManagementServiceAssociatorNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -173,14 +173,14 @@ static CMPIStatus LMI_HostedServiceAssociatorNames(
         cc,
         cr,
         cop,
-        LMI_HostedService_ClassName,
+        LMI_HostedAccountManagementService_ClassName,
         assocClass,
         resultClass,
         role,
         resultRole);
 }
 
-static CMPIStatus LMI_HostedServiceReferences(
+static CMPIStatus LMI_HostedAccountManagementServiceReferences(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -195,13 +195,13 @@ static CMPIStatus LMI_HostedServiceReferences(
         cc,
         cr,
         cop,
-        LMI_HostedService_ClassName,
+        LMI_HostedAccountManagementService_ClassName,
         assocClass,
         role,
         properties);
 }
 
-static CMPIStatus LMI_HostedServiceReferenceNames(
+static CMPIStatus LMI_HostedAccountManagementServiceReferenceNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -215,25 +215,25 @@ static CMPIStatus LMI_HostedServiceReferenceNames(
         cc,
         cr,
         cop,
-        LMI_HostedService_ClassName,
+        LMI_HostedAccountManagementService_ClassName,
         assocClass,
         role);
 }
 
 CMInstanceMIStub( 
-    LMI_HostedService,
-    LMI_HostedService,
+    LMI_HostedAccountManagementService,
+    LMI_HostedAccountManagementService,
     _cb,
-    LMI_HostedServiceInitialize())
+    LMI_HostedAccountManagementServiceInitialize())
 
 CMAssociationMIStub( 
-    LMI_HostedService,
-    LMI_HostedService,
+    LMI_HostedAccountManagementService,
+    LMI_HostedAccountManagementService,
     _cb,
-    LMI_HostedServiceInitialize())
+    LMI_HostedAccountManagementServiceInitialize())
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "LMI_HostedService",
-    "LMI_HostedService",
+    "LMI_HostedAccountManagementService",
+    "LMI_HostedAccountManagementService",
     "instance association")
diff --git a/src/power/LMI_HostedServiceProvider.c b/src/power/LMI_HostedPowerManagementServiceProvider.c
index e6bf6f1..71cf851 100644
--- a/src/power/LMI_HostedServiceProvider.c
+++ b/src/power/LMI_HostedPowerManagementServiceProvider.c
@@ -17,17 +17,17 @@
 
 #include <cmpimacs.h>
 #include <konkret/konkret.h>
-#include "LMI_HostedService.h"
+#include "LMI_HostedPowerManagementService.h"
 
 #include "globals.h"
 
 static const CMPIBroker* _cb;
 
-static void LMI_HostedServiceInitialize()
+static void LMI_HostedPowerManagementServiceInitialize()
 {
 }
 
-static CMPIStatus LMI_HostedServiceCleanup(
+static CMPIStatus LMI_HostedPowerManagementServiceCleanup(
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term)
@@ -35,7 +35,7 @@ static CMPIStatus LMI_HostedServiceCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus LMI_HostedServiceEnumInstanceNames(
+static CMPIStatus LMI_HostedPowerManagementServiceEnumInstanceNames(
     CMPIInstanceMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -45,7 +45,7 @@ static CMPIStatus LMI_HostedServiceEnumInstanceNames(
         _cb, mi, cc, cr, cop);
 }
 
-static CMPIStatus LMI_HostedServiceEnumInstances(
+static CMPIStatus LMI_HostedPowerManagementServiceEnumInstances(
     CMPIInstanceMI* mi,
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -55,8 +55,8 @@ static CMPIStatus LMI_HostedServiceEnumInstances(
     CMPIStatus rc;
     const char *ns = KNameSpace(cop);
 
-    LMI_HostedService w;
-    LMI_HostedService_Init(&w, _cb, ns);
+    LMI_HostedPowerManagementService w;
+    LMI_HostedPowerManagementService_Init(&w, _cb, ns);
 
     CIM_ComputerSystemRef computerSystemRef;
     CIM_ComputerSystemRef_Init(&computerSystemRef, _cb, ns);
@@ -64,7 +64,7 @@ static CMPIStatus LMI_HostedServiceEnumInstances(
     CIM_ComputerSystemRef_Set_CreationClassName(&computerSystemRef, get_system_creation_class_name());
     CMPIObjectPath *computerSystemOP = CIM_ComputerSystemRef_ToObjectPath(&computerSystemRef, &rc);
     computerSystemOP->ft->setClassName(computerSystemOP, get_system_creation_class_name());
-    LMI_HostedService_SetObjectPath_Antecedent(&w, computerSystemOP);
+    LMI_HostedPowerManagementService_SetObjectPath_Antecedent(&w, computerSystemOP);
 
     LMI_PowerManagementServiceRef powerManagementServiceRef;
     LMI_PowerManagementServiceRef_Init(&powerManagementServiceRef, _cb, ns);
@@ -72,13 +72,13 @@ static CMPIStatus LMI_HostedServiceEnumInstances(
     LMI_PowerManagementServiceRef_Set_SystemName(&powerManagementServiceRef, get_system_name());
     LMI_PowerManagementServiceRef_Set_CreationClassName(&powerManagementServiceRef, "LMI_PowerManagementService");
     LMI_PowerManagementServiceRef_Set_SystemCreationClassName(&powerManagementServiceRef, get_system_creation_class_name());
-    LMI_HostedService_Set_Dependent(&w, &powerManagementServiceRef);
+    LMI_HostedPowerManagementService_Set_Dependent(&w, &powerManagementServiceRef);
 
     KReturnInstance(cr, w);
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus LMI_HostedServiceGetInstance(
+static CMPIStatus LMI_HostedPowerManagementServiceGetInstance(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc,
     const CMPIResult* cr, 
@@ -89,7 +89,7 @@ static CMPIStatus LMI_HostedServiceGetInstance(
         _cb, mi, cc, cr, cop, properties);
 }
 
-static CMPIStatus LMI_HostedServiceCreateInstance(
+static CMPIStatus LMI_HostedPowerManagementServiceCreateInstance(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -99,7 +99,7 @@ static CMPIStatus LMI_HostedServiceCreateInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus LMI_HostedServiceModifyInstance(
+static CMPIStatus LMI_HostedPowerManagementServiceModifyInstance(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -110,7 +110,7 @@ static CMPIStatus LMI_HostedServiceModifyInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus LMI_HostedServiceDeleteInstance(
+static CMPIStatus LMI_HostedPowerManagementServiceDeleteInstance(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -119,7 +119,7 @@ static CMPIStatus LMI_HostedServiceDeleteInstance(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus LMI_HostedServiceExecQuery(
+static CMPIStatus LMI_HostedPowerManagementServiceExecQuery(
     CMPIInstanceMI* mi, 
     const CMPIContext* cc, 
     const CMPIResult* cr, 
@@ -130,7 +130,7 @@ static CMPIStatus LMI_HostedServiceExecQuery(
     CMReturn(CMPI_RC_ERR_NOT_SUPPORTED);
 }
 
-static CMPIStatus LMI_HostedServiceAssociationCleanup(
+static CMPIStatus LMI_HostedPowerManagementServiceAssociationCleanup(
     CMPIAssociationMI* mi,
     const CMPIContext* cc, 
     CMPIBoolean term) 
@@ -138,7 +138,7 @@ static CMPIStatus LMI_HostedServiceAssociationCleanup(
     CMReturn(CMPI_RC_OK);
 }
 
-static CMPIStatus LMI_HostedServiceAssociators(
+static CMPIStatus LMI_HostedPowerManagementServiceAssociators(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -155,7 +155,7 @@ static CMPIStatus LMI_HostedServiceAssociators(
         cc,
         cr,
         cop,
-        LMI_HostedService_ClassName,
+        LMI_HostedPowerManagementService_ClassName,
         assocClass,
         resultClass,
         role,
@@ -163,7 +163,7 @@ static CMPIStatus LMI_HostedServiceAssociators(
         properties);
 }
 
-static CMPIStatus LMI_HostedServiceAssociatorNames(
+static CMPIStatus LMI_HostedPowerManagementServiceAssociatorNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -179,14 +179,14 @@ static CMPIStatus LMI_HostedServiceAssociatorNames(
         cc,
         cr,
         cop,
-        LMI_HostedService_ClassName,
+        LMI_HostedPowerManagementService_ClassName,
         assocClass,
         resultClass,
         role,
         resultRole);
 }
 
-static CMPIStatus LMI_HostedServiceReferences(
+static CMPIStatus LMI_HostedPowerManagementServiceReferences(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -201,13 +201,13 @@ static CMPIStatus LMI_HostedServiceReferences(
         cc,
         cr,
         cop,
-        LMI_HostedService_ClassName,
+        LMI_HostedPowerManagementService_ClassName,
         assocClass,
         role,
         properties);
 }
 
-static CMPIStatus LMI_HostedServiceReferenceNames(
+static CMPIStatus LMI_HostedPowerManagementServiceReferenceNames(
     CMPIAssociationMI* mi,
     const CMPIContext* cc,
     const CMPIResult* cr,
@@ -221,25 +221,25 @@ static CMPIStatus LMI_HostedServiceReferenceNames(
         cc,
         cr,
         cop,
-        LMI_HostedService_ClassName,
+        LMI_HostedPowerManagementService_ClassName,
         assocClass,
         role);
 }
 
 CMInstanceMIStub( 
-    LMI_HostedService,
-    LMI_HostedService,
+    LMI_HostedPowerManagementService,
+    LMI_HostedPowerManagementService,
     _cb,
-    LMI_HostedServiceInitialize())
+    LMI_HostedPowerManagementServiceInitialize())
 
 CMAssociationMIStub( 
-    LMI_HostedService,
-    LMI_HostedService,
+    LMI_HostedPowerManagementService,
+    LMI_HostedPowerManagementService,
     _cb,
-    LMI_HostedServiceInitialize())
+    LMI_HostedPowerManagementServiceInitialize())
 
 KONKRET_REGISTRATION(
     "root/cimv2",
-    "LMI_HostedService",
-    "LMI_HostedService",
+    "LMI_HostedPowerManagementService",
+    "LMI_HostedPowerManagementService",
     "instance association")