Menu
▾
▴
omc-commit — Mailing list for subversion commit activity
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(26) |
Dec
(13) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(5) |
Feb
(16) |
Mar
(5) |
Apr
(5) |
May
(13) |
Jun
(12) |
Jul
(1) |
Aug
(2) |
Sep
(13) |
Oct
(6) |
Nov
(1) |
Dec
(29) |
| 2008 |
Jan
(2) |
Feb
(2) |
Mar
(2) |
Apr
(57) |
May
(35) |
Jun
(45) |
Jul
(132) |
Aug
(87) |
Sep
(141) |
Oct
(86) |
Nov
(17) |
Dec
(2) |
| 2009 |
Jan
(3) |
Feb
(2) |
Mar
(3) |
Apr
(3) |
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2010 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <jc...@us...> - 2008-08-18 16:55:53
|
Revision: 857
http://omc.svn.sourceforge.net/omc/?rev=857&view=rev
Author: jcarey
Date: 2008-08-18 16:56:00 +0000 (Mon, 18 Aug 2008)
Log Message:
-----------
Added vnc password to database schema and code to support the vncpassword in the database operations
Modified Paths:
--------------
contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-db.c
contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmcreation-data.c
Modified: contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-db.c
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-db.c 2008-08-15 23:07:51 UTC (rev 856)
+++ contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmbuilder-db.c 2008-08-18 16:56:00 UTC (rev 857)
@@ -79,6 +79,7 @@
"SuspendDataRoot TEXT,"
"SwapFileDataRoot TEXT,"
"VNCPort INTEGER,"
+ "VNCPassword TEXT,"
//-- 0: Unknown
//-- 1: Para
//-- 2: Full
Modified: contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmcreation-data.c
===================================================================
--- contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmcreation-data.c 2008-08-15 23:07:51 UTC (rev 856)
+++ contrib/xen-vm-builder/trunk/src/providers/vm-builder/vmcreation-data.c 2008-08-18 16:56:00 UTC (rev 857)
@@ -96,6 +96,7 @@
"SuspendDataRoot," \
"SwapFileDataRoot," \
"VNCPort," \
+ "VNCPassword," \
"VirtType," \
"VirtualSystemIdentifier," \
"VirtualSystemType"
@@ -141,6 +142,7 @@
CDF_SuspendDataRoot,
CDF_SwapFileDataRoot,
CDF_VNCPort,
+ CDF_VNCPassword,
CDF_VirtType,
CDF_VirtualSystemIdentifier,
CDF_VirtualSystemType
@@ -438,6 +440,7 @@
set_str_prop(dbctx, CDF_SuspendDataRoot, instance, "SuspendDataRoot");
set_str_prop(dbctx, CDF_SwapFileDataRoot, instance, "SwapFileDataRoot");
set_u32_prop(dbctx, CDF_VNCPort, instance, "VNCPort");
+ set_str_prop(dbctx, CDF_VNCPassword, instance, "VNCPassword");
set_u32_prop(dbctx, CDF_VirtType, instance, "VirtType");
set_str_prop(dbctx, CDF_VirtualSystemIdentifier, instance, "VirtualSystemIdentifier");
set_str_prop(dbctx, CDF_VirtualSystemType, instance, "VirtualSystemType");
@@ -923,6 +926,7 @@
mod_add_str_prop(pstra, modified_instance, "SuspendDataRoot", properties);
mod_add_str_prop(pstra, modified_instance, "SwapFileDataRoot", properties);
mod_add_u32_prop(pstra, modified_instance, "VNCPort", properties, NULL);
+ mod_add_str_prop(pstra, modified_instance, "VNCPassword", properties);
mod_add_u32_prop(pstra, modified_instance, "VirtType", properties, &data);
if (valid_virt_type(&data, &status) != CMPI_RC_OK) {
cmpiutilStrArray_destroy(pstra);
@@ -1115,6 +1119,7 @@
add_str_prop_to_query(pstrbuf, newinstance, "SuspendDataRoot", 0);
add_str_prop_to_query(pstrbuf, newinstance, "SwapFileDataRoot", 0);
add_u32_prop_to_query(pstrbuf, newinstance, "VNCPort", NULL);
+ add_str_prop_to_query(pstrbuf, newinstance, "VNCPassword", 0);
add_u32_prop_to_query(pstrbuf, newinstance, "VirtType", &data);
if (valid_virt_type(&data, &status) != CMPI_RC_OK) {
cmpiutilStrBuf_destroy(pstrbuf);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mik...@us...> - 2008-08-15 23:07:44
|
Revision: 856
http://omc.svn.sourceforge.net/omc/?rev=856&view=rev
Author: mike-brasher
Date: 2008-08-15 23:07:51 +0000 (Fri, 15 Aug 2008)
Log Message:
-----------
Added argument to KonkretCMPI default association operations to match
KonkretCMPI 0.8.6.
Modified Paths:
--------------
cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ElementConformsToProfileProvider.c
cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ElementSettingDataProvider.c
cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/HostedServiceProvider.c
cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/OrderedComponentProvider.c
cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ReferencedProfileProvider.c
cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ServiceAffectsElementProvider.c
cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile-interop.mof
cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/DeviceSAPImplementationProvider.c
cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementCapabilitiesLANEndpointProvider.c
cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementCapabilitiesProvider.c
cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementConformsToProfile.h
cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementConformsToProfileProvider.c
cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/HostedAccessPointProvider.c
cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ReferencedProfileProvider.c
cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/SystemDeviceProvider.c
cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/ElementConformsToProfileProvider.c
cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/HostedCollectionProvider.c
cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/IsSpareProvider.c
cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/MemberOfCollectionProvider.c
cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/OwningCollectionElementProvider.c
cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/ReferencedProfileProvider.c
cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/SystemDeviceProvider.c
cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfileProvider.c
cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/HostedCollectionProvider.c
cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/IsSpareProvider.c
cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/MemberOfCollectionProvider.c
cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/OwningCollectionElementProvider.c
cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ReferencedProfileProvider.c
cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/SystemDeviceProvider.c
cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ElementCapabilitiesProvider.c
cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ElementConformsToProfileProvider.c
cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/HostedAccessPointProvider.c
cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/HostedServiceProvider.c
cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ProvidesEndpointProvider.c
cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ReferencedProfileProvider.c
Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ElementConformsToProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ElementConformsToProfileProvider.c 2008-08-15 17:01:59 UTC (rev 855)
+++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ElementConformsToProfileProvider.c 2008-08-15 23:07:51 UTC (rev 856)
@@ -123,11 +123,17 @@
const char* resultRole,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_BootElementConformsToProfile";
-
- return KDefaultAssociators(_cb, mi, cc, cr, cop, assocClass,
- resultClass, role, resultRole, properties);
+ return KDefaultAssociators(_cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ElementConformsToProfile_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole,
+ properties);
}
static CMPIStatus ElementConformsToProfileAssociatorNames(
@@ -140,11 +146,16 @@
const char* role,
const char* resultRole)
{
- if (!assocClass)
- assocClass = "Linux_BootElementConformsToProfile";
-
- return KDefaultAssociatorNames(_cb, mi, cc, cr, cop,
- assocClass, resultClass, role, resultRole);
+ return KDefaultAssociatorNames(_cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ElementConformsToProfile_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole);
}
static CMPIStatus ElementConformsToProfileReferences(
@@ -156,11 +167,15 @@
const char* role,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_BootElementConformsToProfile";
-
- return KDefaultReferences(_cb, mi, cc, cr, cop, assocClass,
- role, properties);
+ return KDefaultReferences(_cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ElementConformsToProfile_ClassName,
+ assocClass,
+ role,
+ properties);
}
static CMPIStatus ElementConformsToProfileReferenceNames(
@@ -171,11 +186,15 @@
const char* assocClass,
const char* role)
{
- if (!assocClass)
- assocClass = "Linux_BootElementConformsToProfile";
-
return KDefaultReferenceNames(
- _cb, mi, cc, cr, cop, assocClass, role);
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ElementConformsToProfile_ClassName,
+ assocClass,
+ role);
}
CMInstanceMIStub(
Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ElementSettingDataProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ElementSettingDataProvider.c 2008-08-15 17:01:59 UTC (rev 855)
+++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ElementSettingDataProvider.c 2008-08-15 23:07:51 UTC (rev 856)
@@ -127,11 +127,18 @@
const char* resultRole,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_BootElementSettingData";
-
- return KDefaultAssociators(_cb, mi, cc, cr, cop, assocClass,
- resultClass, role, resultRole, properties);
+ return KDefaultAssociators(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ElementSettingData_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole,
+ properties);
}
static CMPIStatus ElementSettingDataAssociatorNames(
@@ -144,11 +151,17 @@
const char* role,
const char* resultRole)
{
- if (!assocClass)
- assocClass = "Linux_BootElementSettingData";
-
- return KDefaultAssociatorNames(_cb, mi, cc, cr, cop,
- assocClass, resultClass, role, resultRole);
+ return KDefaultAssociatorNames(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ElementSettingData_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole);
}
static CMPIStatus ElementSettingDataReferences(
@@ -160,11 +173,16 @@
const char* role,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_BootElementSettingData";
-
- return KDefaultReferences(_cb, mi, cc, cr, cop, assocClass,
- role, properties);
+ return KDefaultReferences(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ElementSettingData_ClassName,
+ assocClass,
+ role,
+ properties);
}
static CMPIStatus ElementSettingDataReferenceNames(
@@ -175,11 +193,15 @@
const char* assocClass,
const char* role)
{
- if (!assocClass)
- assocClass = "Linux_BootElementSettingData";
-
return KDefaultReferenceNames(
- _cb, mi, cc, cr, cop, assocClass, role);
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ElementSettingData_ClassName,
+ assocClass,
+ role);
}
CMInstanceMIStub(
Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/HostedServiceProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/HostedServiceProvider.c 2008-08-15 17:01:59 UTC (rev 855)
+++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/HostedServiceProvider.c 2008-08-15 23:07:51 UTC (rev 856)
@@ -130,11 +130,18 @@
const char* resultRole,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_BootHostedService";
-
- return KDefaultAssociators(_cb, mi, cc, cr, cop, assocClass,
- resultClass, role, resultRole, properties);
+ return KDefaultAssociators(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ HostedService_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole,
+ properties);
}
static CMPIStatus HostedServiceAssociatorNames(
@@ -147,11 +154,17 @@
const char* role,
const char* resultRole)
{
- if (!assocClass)
- assocClass = "Linux_BootHostedService";
-
- return KDefaultAssociatorNames(_cb, mi, cc, cr, cop,
- assocClass, resultClass, role, resultRole);
+ return KDefaultAssociatorNames(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ HostedService_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole);
}
static CMPIStatus HostedServiceReferences(
@@ -163,11 +176,16 @@
const char* role,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_BootHostedService";
-
- return KDefaultReferences(_cb, mi, cc, cr, cop, assocClass,
- role, properties);
+ return KDefaultReferences(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ HostedService_ClassName,
+ assocClass,
+ role,
+ properties);
}
static CMPIStatus HostedServiceReferenceNames(
@@ -178,11 +196,15 @@
const char* assocClass,
const char* role)
{
- if (!assocClass)
- assocClass = "Linux_BootHostedService";
-
return KDefaultReferenceNames(
- _cb, mi, cc, cr, cop, assocClass, role);
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ HostedService_ClassName,
+ assocClass,
+ role);
}
CMInstanceMIStub(
Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/OrderedComponentProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/OrderedComponentProvider.c 2008-08-15 17:01:59 UTC (rev 855)
+++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/OrderedComponentProvider.c 2008-08-15 23:07:51 UTC (rev 856)
@@ -140,11 +140,18 @@
const char* resultRole,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_BootOrderedComponent";
-
- return KDefaultAssociators(_cb, mi, cc, cr, cop, assocClass,
- resultClass, role, resultRole, properties);
+ return KDefaultAssociators(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ OrderedComponent_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole,
+ properties);
}
static CMPIStatus OrderedComponentAssociatorNames(
@@ -157,11 +164,17 @@
const char* role,
const char* resultRole)
{
- if (!assocClass)
- assocClass = "Linux_BootOrderedComponent";
-
- return KDefaultAssociatorNames(_cb, mi, cc, cr, cop,
- assocClass, resultClass, role, resultRole);
+ return KDefaultAssociatorNames(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ OrderedComponent_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole);
}
static CMPIStatus OrderedComponentReferences(
@@ -173,11 +186,16 @@
const char* role,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_BootOrderedComponent";
-
- return KDefaultReferences(_cb, mi, cc, cr, cop, assocClass,
- role, properties);
+ return KDefaultReferences(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ OrderedComponent_ClassName,
+ assocClass,
+ role,
+ properties);
}
static CMPIStatus OrderedComponentReferenceNames(
@@ -188,11 +206,15 @@
const char* assocClass,
const char* role)
{
- if (!assocClass)
- assocClass = "Linux_BootOrderedComponent";
-
return KDefaultReferenceNames(
- _cb, mi, cc, cr, cop, assocClass, role);
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ OrderedComponent_ClassName,
+ assocClass,
+ role);
}
CMInstanceMIStub(
Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ReferencedProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ReferencedProfileProvider.c 2008-08-15 17:01:59 UTC (rev 855)
+++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ReferencedProfileProvider.c 2008-08-15 23:07:51 UTC (rev 856)
@@ -127,11 +127,18 @@
const char* resultRole,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_BootReferencedProfile";
-
- return KDefaultAssociators(_cb, mi, cc, cr, cop, assocClass,
- resultClass, role, resultRole, properties);
+ return KDefaultAssociators(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ReferencedProfile_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole,
+ properties);
}
static CMPIStatus ReferencedProfileAssociatorNames(
@@ -144,11 +151,17 @@
const char* role,
const char* resultRole)
{
- if (!assocClass)
- assocClass = "Linux_BootReferencedProfile";
-
- return KDefaultAssociatorNames(_cb, mi, cc, cr, cop,
- assocClass, resultClass, role, resultRole);
+ return KDefaultAssociatorNames(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ReferencedProfile_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole);
}
static CMPIStatus ReferencedProfileReferences(
@@ -160,11 +173,16 @@
const char* role,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_BootReferencedProfile";
-
- return KDefaultReferences(_cb, mi, cc, cr, cop, assocClass,
- role, properties);
+ return KDefaultReferences(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ReferencedProfile_ClassName,
+ assocClass,
+ role,
+ properties);
}
static CMPIStatus ReferencedProfileReferenceNames(
@@ -175,11 +193,15 @@
const char* assocClass,
const char* role)
{
- if (!assocClass)
- assocClass = "Linux_BootReferencedProfile";
-
return KDefaultReferenceNames(
- _cb, mi, cc, cr, cop, assocClass, role);
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ReferencedProfile_ClassName,
+ assocClass,
+ role);
}
CMInstanceMIStub(
Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ServiceAffectsElementProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ServiceAffectsElementProvider.c 2008-08-15 17:01:59 UTC (rev 855)
+++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ServiceAffectsElementProvider.c 2008-08-15 23:07:51 UTC (rev 856)
@@ -130,11 +130,18 @@
const char* resultRole,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_BootServiceAffectsElement";
-
- return KDefaultAssociators(_cb, mi, cc, cr, cop, assocClass,
- resultClass, role, resultRole, properties);
+ return KDefaultAssociators(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ServiceAffectsElement_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole,
+ properties);
}
static CMPIStatus ServiceAffectsElementAssociatorNames(
@@ -147,11 +154,17 @@
const char* role,
const char* resultRole)
{
- if (!assocClass)
- assocClass = "Linux_BootServiceAffectsElement";
-
- return KDefaultAssociatorNames(_cb, mi, cc, cr, cop,
- assocClass, resultClass, role, resultRole);
+ return KDefaultAssociatorNames(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ServiceAffectsElement_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole);
}
static CMPIStatus ServiceAffectsElementReferences(
@@ -163,11 +176,16 @@
const char* role,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_BootServiceAffectsElement";
-
- return KDefaultReferences(_cb, mi, cc, cr, cop, assocClass,
- role, properties);
+ return KDefaultReferences(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ServiceAffectsElement_ClassName,
+ assocClass,
+ role,
+ properties);
}
static CMPIStatus ServiceAffectsElementReferenceNames(
@@ -178,11 +196,15 @@
const char* assocClass,
const char* role)
{
- if (!assocClass)
- assocClass = "Linux_BootServiceAffectsElement";
-
return KDefaultReferenceNames(
- _cb, mi, cc, cr, cop, assocClass, role);
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ServiceAffectsElement_ClassName,
+ assocClass,
+ role);
}
CMInstanceMIStub(
Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile-interop.mof
===================================================================
--- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile-interop.mof 2008-08-15 17:01:59 UTC (rev 855)
+++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile-interop.mof 2008-08-15 23:07:51 UTC (rev 856)
@@ -6,7 +6,7 @@
class Linux_ElementConformsToProfileEthernetPort : CIM_ElementConformsToProfile
{
[Key] Linux_RegisteredProfileEthernetPort REF ConformantStandard;
- // [Key] Linux_EthernetPort REF ManagedElement;
+ [Key] Linux_EthernetPort REF ManagedElement;
};
[Association]
Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/DeviceSAPImplementationProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/DeviceSAPImplementationProvider.c 2008-08-15 17:01:59 UTC (rev 855)
+++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/DeviceSAPImplementationProvider.c 2008-08-15 23:07:51 UTC (rev 856)
@@ -154,12 +154,19 @@
const char* resultRole,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_DeviceSAPImplementationEthernetPort";
+ CMPIStatus st = KDefaultAssociators(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ DeviceSAPImplementation_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole,
+ properties);
- CMPIStatus st = KDefaultAssociators(_cb, mi, cc, cr, cop, assocClass,
- resultClass, role, resultRole, properties);
-
return st;
}
@@ -173,11 +180,17 @@
const char* role,
const char* resultRole)
{
- if (!assocClass)
- assocClass = "Linux_DeviceSAPImplementationEthernetPort";
-
- return KDefaultAssociatorNames(_cb, mi, cc, cr, cop,
- assocClass, resultClass, role, resultRole);
+ return KDefaultAssociatorNames(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ DeviceSAPImplementation_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole);
}
static CMPIStatus DeviceSAPImplementationReferences(
@@ -189,11 +202,16 @@
const char* role,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_DeviceSAPImplementationEthernetPort";
-
- return KDefaultReferences(_cb, mi, cc, cr, cop, assocClass,
- role, properties);
+ return KDefaultReferences(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ DeviceSAPImplementation_ClassName,
+ assocClass,
+ role,
+ properties);
}
static CMPIStatus DeviceSAPImplementationReferenceNames(
@@ -204,11 +222,15 @@
const char* assocClass,
const char* role)
{
- if (!assocClass)
- assocClass = "Linux_DeviceSAPImplementationEthernetPort";
-
return KDefaultReferenceNames(
- _cb, mi, cc, cr, cop, assocClass, role);
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ DeviceSAPImplementation_ClassName,
+ assocClass,
+ role);
}
CMInstanceMIStub(
Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementCapabilitiesLANEndpointProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementCapabilitiesLANEndpointProvider.c 2008-08-15 17:01:59 UTC (rev 855)
+++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementCapabilitiesLANEndpointProvider.c 2008-08-15 23:07:51 UTC (rev 856)
@@ -122,11 +122,18 @@
const char* resultRole,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_ElementCapabilitiesLANEndpoint";
-
- return KDefaultAssociators(_cb, mi, cc, cr, cop, assocClass,
- resultClass, role, resultRole, properties);
+ return KDefaultAssociators(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ElementCapabilitiesLANEndpoint_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole,
+ properties);
}
static CMPIStatus ElementCapabilitiesLANEndpointAssociatorNames(
@@ -139,11 +146,17 @@
const char* role,
const char* resultRole)
{
- if (!assocClass)
- assocClass = "Linux_ElementCapabilitiesLANEndpoint";
-
- return KDefaultAssociatorNames(_cb, mi, cc, cr, cop,
- assocClass, resultClass, role, resultRole);
+ return KDefaultAssociatorNames(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ElementCapabilitiesLANEndpoint_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole);
}
static CMPIStatus ElementCapabilitiesLANEndpointReferences(
@@ -155,11 +168,16 @@
const char* role,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_ElementCapabilitiesLANEndpoint";
-
- return KDefaultReferences(_cb, mi, cc, cr, cop, assocClass,
- role, properties);
+ return KDefaultReferences(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ElementCapabilitiesLANEndpoint_ClassName,
+ assocClass,
+ role,
+ properties);
}
static CMPIStatus ElementCapabilitiesLANEndpointReferenceNames(
@@ -170,11 +188,15 @@
const char* assocClass,
const char* role)
{
- if (!assocClass)
- assocClass = "Linux_ElementCapabilitiesLANEndpoint";
-
return KDefaultReferenceNames(
- _cb, mi, cc, cr, cop, assocClass, role);
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ElementCapabilitiesLANEndpoint_ClassName,
+ assocClass,
+ role);
}
CMInstanceMIStub(
Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementCapabilitiesProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementCapabilitiesProvider.c 2008-08-15 17:01:59 UTC (rev 855)
+++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementCapabilitiesProvider.c 2008-08-15 23:07:51 UTC (rev 856)
@@ -121,11 +121,18 @@
const char* resultRole,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_ElementCapabilitiesEthernetPort";
-
- return KDefaultAssociators(_cb, mi, cc, cr, cop, assocClass,
- resultClass, role, resultRole, properties);
+ return KDefaultAssociators(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ElementCapabilities_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole,
+ properties);
}
static CMPIStatus ElementCapabilitiesAssociatorNames(
@@ -138,11 +145,17 @@
const char* role,
const char* resultRole)
{
- if (!assocClass)
- assocClass = "Linux_ElementCapabilitiesEthernetPort";
-
- return KDefaultAssociatorNames(_cb, mi, cc, cr, cop,
- assocClass, resultClass, role, resultRole);
+ return KDefaultAssociatorNames(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ElementCapabilities_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole);
}
static CMPIStatus ElementCapabilitiesReferences(
@@ -154,11 +167,16 @@
const char* role,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_ElementCapabilitiesEthernetPort";
-
- return KDefaultReferences(_cb, mi, cc, cr, cop, assocClass,
- role, properties);
+ return KDefaultReferences(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ElementCapabilities_ClassName,
+ assocClass,
+ role,
+ properties);
}
static CMPIStatus ElementCapabilitiesReferenceNames(
@@ -169,11 +187,15 @@
const char* assocClass,
const char* role)
{
- if (!assocClass)
- assocClass = "Linux_ElementCapabilitiesEthernetPort";
-
return KDefaultReferenceNames(
- _cb, mi, cc, cr, cop, assocClass, role);
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ElementCapabilities_ClassName,
+ assocClass,
+ role);
}
CMInstanceMIStub(
Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementConformsToProfile.h
===================================================================
--- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementConformsToProfile.h 2008-08-15 17:01:59 UTC (rev 855)
+++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementConformsToProfile.h 2008-08-15 23:07:51 UTC (rev 856)
@@ -11,7 +11,7 @@
#include <konkret/konkret.h>
#include "RegisteredProfile.h"
-#include "CIM_ManagedElement.h"
+#include "EthernetPort.h"
/*
**==============================================================================
@@ -27,7 +27,7 @@
KBase __base;
/* CIM_ElementConformsToProfile features */
const KRef ConformantStandard; /* RegisteredProfile */
- const KRef ManagedElement; /* CIM_ManagedElement */
+ const KRef ManagedElement; /* EthernetPort */
/* Linux_ElementConformsToProfileEthernetPort features */
}
ElementConformsToProfileRef;
@@ -50,7 +50,7 @@
const unsigned char* sig = __ElementConformsToProfileRef_sig;
KBase_Init(&self->__base, cb, sizeof(*self), sig, ns);
((KRef*)&self->ConformantStandard)->__sig = __RegisteredProfile_sig;
- ((KRef*)&self->ManagedElement)->__sig = __CIM_ManagedElement_sig;
+ ((KRef*)&self->ManagedElement)->__sig = __EthernetPort_sig;
}
KINLINE CMPIStatus ElementConformsToProfileRef_InitFromInstance(
@@ -156,7 +156,7 @@
KINLINE CMPIStatus ElementConformsToProfileRef_Set_ManagedElement(
ElementConformsToProfileRef* self,
- const CIM_ManagedElementRef* x)
+ const EthernetPortRef* x)
{
if (self && self->__base.magic == KMAGIC)
{
@@ -200,7 +200,7 @@
KBase __base;
/* CIM_ElementConformsToProfile features */
const KRef ConformantStandard; /* RegisteredProfile */
- const KRef ManagedElement; /* CIM_ManagedElement */
+ const KRef ManagedElement; /* EthernetPort */
/* Linux_ElementConformsToProfileEthernetPort features */
}
ElementConformsToProfile;
@@ -223,7 +223,7 @@
const unsigned char* sig = __ElementConformsToProfile_sig;
KBase_Init(&self->__base, cb, sizeof(*self), sig, ns);
((KRef*)&self->ConformantStandard)->__sig = __RegisteredProfile_sig;
- ((KRef*)&self->ManagedElement)->__sig = __CIM_ManagedElement_sig;
+ ((KRef*)&self->ManagedElement)->__sig = __EthernetPort_sig;
}
KINLINE CMPIStatus ElementConformsToProfile_InitFromInstance(
@@ -329,7 +329,7 @@
KINLINE CMPIStatus ElementConformsToProfile_Set_ManagedElement(
ElementConformsToProfile* self,
- const CIM_ManagedElementRef* x)
+ const EthernetPortRef* x)
{
if (self && self->__base.magic == KMAGIC)
{
Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementConformsToProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementConformsToProfileProvider.c 2008-08-15 17:01:59 UTC (rev 855)
+++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementConformsToProfileProvider.c 2008-08-15 23:07:51 UTC (rev 856)
@@ -5,6 +5,19 @@
static const CMPIBroker* _cb;
+static CMPIBoolean _precheck(const CMPIObjectPath* cop)
+{
+ const char* cn = KClassName(cop);
+
+ if (strcmp(cn, "Linux_EthernetPort") == 0)
+ return 1;
+
+ if (strcmp(cn, "Linux_RegisteredProfileEthernetPort") == 0)
+ return 1;
+
+ return 0;
+}
+
static void ElementConformsToProfileInitialize()
{
}
@@ -124,11 +137,18 @@
const char* resultRole,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_ElementConformsToProfileEthernetPort";
-
- return KDefaultAssociators(_cb, mi, cc, cr, cop, assocClass,
- resultClass, role, resultRole, properties);
+ return KDefaultAssociators(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ElementConformsToProfile_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole,
+ properties);
}
static CMPIStatus ElementConformsToProfileAssociatorNames(
@@ -141,11 +161,17 @@
const char* role,
const char* resultRole)
{
- if (!assocClass)
- assocClass = "Linux_ElementConformsToProfileEthernetPort";
-
- return KDefaultAssociatorNames(_cb, mi, cc, cr, cop,
- assocClass, resultClass, role, resultRole);
+ return KDefaultAssociatorNames(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ElementConformsToProfile_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole);
}
static CMPIStatus ElementConformsToProfileReferences(
@@ -157,10 +183,14 @@
const char* role,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_ElementConformsToProfileEthernetPort";
-
- return KDefaultReferences(_cb, mi, cc, cr, cop, assocClass,
+ return KDefaultReferences(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ElementConformsToProfile_ClassName,
+ assocClass,
role, properties);
}
@@ -172,11 +202,15 @@
const char* assocClass,
const char* role)
{
- if (!assocClass)
- assocClass = "Linux_ElementConformsToProfileEthernetPort";
-
return KDefaultReferenceNames(
- _cb, mi, cc, cr, cop, assocClass, role);
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ElementConformsToProfile_ClassName,
+ assocClass,
+ role);
}
CMInstanceMIStub(
Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/HostedAccessPointProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/HostedAccessPointProvider.c 2008-08-15 17:01:59 UTC (rev 855)
+++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/HostedAccessPointProvider.c 2008-08-15 23:07:51 UTC (rev 856)
@@ -118,11 +118,18 @@
const char* resultRole,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_HostedAccessPointEthernetPort";
-
- return KDefaultAssociators(_cb, mi, cc, cr, cop, assocClass,
- resultClass, role, resultRole, properties);
+ return KDefaultAssociators(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ HostedAccessPoint_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole,
+ properties);
}
static CMPIStatus HostedAccessPointAssociatorNames(
@@ -135,11 +142,17 @@
const char* role,
const char* resultRole)
{
- if (!assocClass)
- assocClass = "Linux_HostedAccessPointEthernetPort";
-
- return KDefaultAssociatorNames(_cb, mi, cc, cr, cop,
- assocClass, resultClass, role, resultRole);
+ return KDefaultAssociatorNames(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ HostedAccessPoint_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole);
}
static CMPIStatus HostedAccessPointReferences(
@@ -151,11 +164,16 @@
const char* role,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_HostedAccessPointEthernetPort";
-
- return KDefaultReferences(_cb, mi, cc, cr, cop, assocClass,
- role, properties);
+ return KDefaultReferences(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ HostedAccessPoint_ClassName,
+ assocClass,
+ role,
+ properties);
}
static CMPIStatus HostedAccessPointReferenceNames(
@@ -166,11 +184,15 @@
const char* assocClass,
const char* role)
{
- if (!assocClass)
- assocClass = "Linux_HostedAccessPointEthernetPort";
-
return KDefaultReferenceNames(
- _cb, mi, cc, cr, cop, assocClass, role);
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ HostedAccessPoint_ClassName,
+ assocClass,
+ role);
}
CMInstanceMIStub(
Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ReferencedProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ReferencedProfileProvider.c 2008-08-15 17:01:59 UTC (rev 855)
+++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ReferencedProfileProvider.c 2008-08-15 23:07:51 UTC (rev 856)
@@ -128,11 +128,18 @@
const char* resultRole,
const char** properties)
{
- if (!assocClass)
- assocClass = ReferencedProfile_ClassName;
-
- return KDefaultAssociators(_cb, mi, cc, cr, cop, assocClass,
- resultClass, role, resultRole, properties);
+ return KDefaultAssociators(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ReferencedProfile_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole,
+ properties);
}
static CMPIStatus ReferencedProfileAssociatorNames(
@@ -145,11 +152,17 @@
const char* role,
const char* resultRole)
{
- if (!assocClass)
- assocClass = ReferencedProfile_ClassName;
-
- return KDefaultAssociatorNames(_cb, mi, cc, cr, cop,
- assocClass, resultClass, role, resultRole);
+ return KDefaultAssociatorNames(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ReferencedProfile_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole);
}
static CMPIStatus ReferencedProfileReferences(
@@ -161,11 +174,16 @@
const char* role,
const char** properties)
{
- if (!assocClass)
- assocClass = ReferencedProfile_ClassName;
-
- return KDefaultReferences(_cb, mi, cc, cr, cop, assocClass,
- role, properties);
+ return KDefaultReferences(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ReferencedProfile_ClassName,
+ assocClass,
+ role,
+ properties);
}
static CMPIStatus ReferencedProfileReferenceNames(
@@ -176,11 +194,15 @@
const char* assocClass,
const char* role)
{
- if (!assocClass)
- assocClass = ReferencedProfile_ClassName;
-
return KDefaultReferenceNames(
- _cb, mi, cc, cr, cop, assocClass, role);
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ReferencedProfile_ClassName,
+ assocClass,
+ role);
}
CMInstanceMIStub(
Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/SystemDeviceProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/SystemDeviceProvider.c 2008-08-15 17:01:59 UTC (rev 855)
+++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/SystemDeviceProvider.c 2008-08-15 23:07:51 UTC (rev 856)
@@ -119,11 +119,18 @@
const char* resultRole,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_SystemDeviceEthernetPort";
-
- return KDefaultAssociators(_cb, mi, cc, cr, cop, assocClass,
- resultClass, role, resultRole, properties);
+ return KDefaultAssociators(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ SystemDevice_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole,
+ properties);
}
static CMPIStatus SystemDeviceAssociatorNames(
@@ -136,11 +143,17 @@
const char* role,
const char* resultRole)
{
- if (!assocClass)
- assocClass = "Linux_SystemDeviceEthernetPort";
-
- return KDefaultAssociatorNames(_cb, mi, cc, cr, cop,
- assocClass, resultClass, role, resultRole);
+ return KDefaultAssociatorNames(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ SystemDevice_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole);
}
static CMPIStatus SystemDeviceReferences(
@@ -152,11 +165,16 @@
const char* role,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_SystemDeviceEthernetPort";
-
- return KDefaultReferences(_cb, mi, cc, cr, cop, assocClass,
- role, properties);
+ return KDefaultReferences(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ SystemDevice_ClassName,
+ assocClass,
+ role,
+ properties);
}
static CMPIStatus SystemDeviceReferenceNames(
@@ -167,11 +185,15 @@
const char* assocClass,
const char* role)
{
- if (!assocClass)
- assocClass = "Linux_SystemDeviceEthernetPort";
-
return KDefaultReferenceNames(
- _cb, mi, cc, cr, cop, assocClass, role);
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ SystemDevice_ClassName,
+ assocClass,
+ role);
}
CMInstanceMIStub(
Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/ElementConformsToProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/ElementConformsToProfileProvider.c 2008-08-15 17:01:59 UTC (rev 855)
+++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/ElementConformsToProfileProvider.c 2008-08-15 23:07:51 UTC (rev 856)
@@ -123,11 +123,18 @@
const char* resultRole,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_FanElementConformsToProfile";
-
- return KDefaultAssociators(_cb, mi, cc, cr, cop, assocClass,
- resultClass, role, resultRole, properties);
+ return KDefaultAssociators(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ElementConformsToProfile_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole,
+ properties);
}
static CMPIStatus ElementConformsToProfileAssociatorNames(
@@ -140,11 +147,17 @@
const char* role,
const char* resultRole)
{
- if (!assocClass)
- assocClass = "Linux_FanElementConformsToProfile";
-
- return KDefaultAssociatorNames(_cb, mi, cc, cr, cop,
- assocClass, resultClass, role, resultRole);
+ return KDefaultAssociatorNames(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ElementConformsToProfile_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole);
}
static CMPIStatus ElementConformsToProfileReferences(
@@ -156,11 +169,16 @@
const char* role,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_FanElementConformsToProfile";
-
- return KDefaultReferences(_cb, mi, cc, cr, cop, assocClass,
- role, properties);
+ return KDefaultReferences(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ElementConformsToProfile_ClassName,
+ assocClass,
+ role,
+ properties);
}
static CMPIStatus ElementConformsToProfileReferenceNames(
@@ -171,11 +189,15 @@
const char* assocClass,
const char* role)
{
- if (!assocClass)
- assocClass = "Linux_FanElementConformsToProfile";
-
return KDefaultReferenceNames(
- _cb, mi, cc, cr, cop, assocClass, role);
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ElementConformsToProfile_ClassName,
+ assocClass,
+ role);
}
CMInstanceMIStub(
Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/HostedCollectionProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/HostedCollectionProvider.c 2008-08-15 17:01:59 UTC (rev 855)
+++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/HostedCollectionProvider.c 2008-08-15 23:07:51 UTC (rev 856)
@@ -148,11 +148,18 @@
const char* resultRole,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_FanHostedCollection";
-
- return KDefaultAssociators(_cb, mi, cc, cr, cop, assocClass,
- resultClass, role, resultRole, properties);
+ return KDefaultAssociators(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ HostedCollection_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole,
+ properties);
}
static CMPIStatus HostedCollectionAssociatorNames(
@@ -165,11 +172,17 @@
const char* role,
const char* resultRole)
{
- if (!assocClass)
- assocClass = "Linux_FanHostedCollection";
-
- return KDefaultAssociatorNames(_cb, mi, cc, cr, cop,
- assocClass, resultClass, role, resultRole);
+ return KDefaultAssociatorNames(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ HostedCollection_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole);
}
static CMPIStatus HostedCollectionReferences(
@@ -181,11 +194,16 @@
const char* role,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_FanHostedCollection";
-
- return KDefaultReferences(_cb, mi, cc, cr, cop, assocClass,
- role, properties);
+ return KDefaultReferences(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ HostedCollection_ClassName,
+ assocClass,
+ role,
+ properties);
}
static CMPIStatus HostedCollectionReferenceNames(
@@ -196,11 +214,15 @@
const char* assocClass,
const char* role)
{
- if (!assocClass)
- assocClass = "Linux_FanHostedCollection";
-
return KDefaultReferenceNames(
- _cb, mi, cc, cr, cop, assocClass, role);
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ HostedCollection_ClassName,
+ assocClass,
+ role);
}
CMInstanceMIStub(
Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/IsSpareProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/IsSpareProvider.c 2008-08-15 17:01:59 UTC (rev 855)
+++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/IsSpareProvider.c 2008-08-15 23:07:51 UTC (rev 856)
@@ -149,11 +149,18 @@
const char* resultRole,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_FanIsSpare";
-
- return KDefaultAssociators(_cb, mi, cc, cr, cop, assocClass,
- resultClass, role, resultRole, properties);
+ return KDefaultAssociators(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ IsSpare_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole,
+ properties);
}
static CMPIStatus IsSpareAssociatorNames(
@@ -166,11 +173,17 @@
const char* role,
const char* resultRole)
{
- if (!assocClass)
- assocClass = "Linux_FanIsSpare";
-
- return KDefaultAssociatorNames(_cb, mi, cc, cr, cop,
- assocClass, resultClass, role, resultRole);
+ return KDefaultAssociatorNames(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ IsSpare_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole);
}
static CMPIStatus IsSpareReferences(
@@ -182,11 +195,16 @@
const char* role,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_FanIsSpare";
-
- return KDefaultReferences(_cb, mi, cc, cr, cop, assocClass,
- role, properties);
+ return KDefaultReferences(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ IsSpare_ClassName,
+ assocClass,
+ role,
+ properties);
}
static CMPIStatus IsSpareReferenceNames(
@@ -197,11 +215,15 @@
const char* assocClass,
const char* role)
{
- if (!assocClass)
- assocClass = "Linux_FanIsSpare";
-
return KDefaultReferenceNames(
- _cb, mi, cc, cr, cop, assocClass, role);
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ IsSpare_ClassName,
+ assocClass,
+ role);
}
CMInstanceMIStub(
Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/MemberOfCollectionProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/MemberOfCollectionProvider.c 2008-08-15 17:01:59 UTC (rev 855)
+++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/MemberOfCollectionProvider.c 2008-08-15 23:07:51 UTC (rev 856)
@@ -146,11 +146,18 @@
const char* resultRole,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_FanMemberOfCollection";
-
- return KDefaultAssociators(_cb, mi, cc, cr, cop, assocClass,
- resultClass, role, resultRole, properties);
+ return KDefaultAssociators(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ MemberOfCollection_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole,
+ properties);
}
static CMPIStatus MemberOfCollectionAssociatorNames(
@@ -163,11 +170,17 @@
const char* role,
const char* resultRole)
{
- if (!assocClass)
- assocClass = "Linux_FanMemberOfCollection";
-
- return KDefaultAssociatorNames(_cb, mi, cc, cr, cop,
- assocClass, resultClass, role, resultRole);
+ return KDefaultAssociatorNames(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ MemberOfCollection_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole);
}
static CMPIStatus MemberOfCollectionReferences(
@@ -179,11 +192,16 @@
const char* role,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_FanMemberOfCollection";
-
- return KDefaultReferences(_cb, mi, cc, cr, cop, assocClass,
- role, properties);
+ return KDefaultReferences(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ MemberOfCollection_ClassName,
+ assocClass,
+ role,
+ properties);
}
static CMPIStatus MemberOfCollectionReferenceNames(
@@ -194,11 +212,15 @@
const char* assocClass,
const char* role)
{
- if (!assocClass)
- assocClass = "Linux_FanMemberOfCollection";
-
return KDefaultReferenceNames(
- _cb, mi, cc, cr, cop, assocClass, role);
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ MemberOfCollection_ClassName,
+ assocClass,
+ role);
}
CMInstanceMIStub(
Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/OwningCollectionElementProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/OwningCollectionElementProvider.c 2008-08-15 17:01:59 UTC (rev 855)
+++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/OwningCollectionElementProvider.c 2008-08-15 23:07:51 UTC (rev 856)
@@ -148,11 +148,18 @@
const char* resultRole,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_FanOwningCollectionElement";
-
- return KDefaultAssociators(_cb, mi, cc, cr, cop, assocClass,
- resultClass, role, resultRole, properties);
+ return KDefaultAssociators(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ OwningCollectionElement_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole,
+ properties);
}
static CMPIStatus OwningCollectionElementAssociatorNames(
@@ -165,11 +172,17 @@
const char* role,
const char* resultRole)
{
- if (!assocClass)
- assocClass = "Linux_FanOwningCollectionElement";
-
- return KDefaultAssociatorNames(_cb, mi, cc, cr, cop,
- assocClass, resultClass, role, resultRole);
+ return KDefaultAssociatorNames(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ OwningCollectionElement_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole);
}
static CMPIStatus OwningCollectionElementReferences(
@@ -181,11 +194,16 @@
const char* role,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_FanOwningCollectionElement";
-
- return KDefaultReferences(_cb, mi, cc, cr, cop, assocClass,
- role, properties);
+ return KDefaultReferences(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ OwningCollectionElement_ClassName,
+ assocClass,
+ role,
+ properties);
}
static CMPIStatus OwningCollectionElementReferenceNames(
@@ -196,11 +214,15 @@
const char* assocClass,
const char* role)
{
- if (!assocClass)
- assocClass = "Linux_FanOwningCollectionElement";
-
return KDefaultReferenceNames(
- _cb, mi, cc, cr, cop, assocClass, role);
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ OwningCollectionElement_ClassName,
+ assocClass,
+ role);
}
CMInstanceMIStub(
Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/ReferencedProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/ReferencedProfileProvider.c 2008-08-15 17:01:59 UTC (rev 855)
+++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/ReferencedProfileProvider.c 2008-08-15 23:07:51 UTC (rev 856)
@@ -127,11 +127,18 @@
const char* resultRole,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_FanReferencedProfile";
-
- return KDefaultAssociators(_cb, mi, cc, cr, cop, assocClass,
- resultClass, role, resultRole, properties);
+ return KDefaultAssociators(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ReferencedProfile_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole,
+ properties);
}
static CMPIStatus ReferencedProfileAssociatorNames(
@@ -144,11 +151,17 @@
const char* role,
const char* resultRole)
{
- if (!assocClass)
- assocClass = "Linux_FanReferencedProfile";
-
- return KDefaultAssociatorNames(_cb, mi, cc, cr, cop,
- assocClass, resultClass, role, resultRole);
+ return KDefaultAssociatorNames(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ReferencedProfile_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole);
}
static CMPIStatus ReferencedProfileReferences(
@@ -160,11 +173,16 @@
const char* role,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_FanReferencedProfile";
-
- return KDefaultReferences(_cb, mi, cc, cr, cop, assocClass,
- role, properties);
+ return KDefaultReferences(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ReferencedProfile_ClassName,
+ assocClass,
+ role,
+ properties);
}
static CMPIStatus ReferencedProfileReferenceNames(
@@ -175,11 +193,15 @@
const char* assocClass,
const char* role)
{
- if (!assocClass)
- assocClass = "Linux_FanReferencedProfile";
-
return KDefaultReferenceNames(
- _cb, mi, cc, cr, cop, assocClass, role);
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ReferencedProfile_ClassName,
+ assocClass,
+ role);
}
CMInstanceMIStub(
Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/SystemDeviceProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/SystemDeviceProvider.c 2008-08-15 17:01:59 UTC (rev 855)
+++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/SystemDeviceProvider.c 2008-08-15 23:07:51 UTC (rev 856)
@@ -125,11 +125,18 @@
const char* resultRole,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_FanSystemDevice";
-
- return KDefaultAssociators(_cb, mi, cc, cr, cop, assocClass,
- resultClass, role, resultRole, properties);
+ return KDefaultAssociators(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ SystemDevice_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole,
+ properties);
}
static CMPIStatus SystemDeviceAssociatorNames(
@@ -142,11 +149,17 @@
const char* role,
const char* resultRole)
{
- if (!assocClass)
- assocClass = "Linux_FanSystemDevice";
-
- return KDefaultAssociatorNames(_cb, mi, cc, cr, cop,
- assocClass, resultClass, role, resultRole);
+ return KDefaultAssociatorNames(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ SystemDevice_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole);
}
static CMPIStatus SystemDeviceReferences(
@@ -158,11 +171,16 @@
const char* role,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_FanSystemDevice";
-
- return KDefaultReferences(_cb, mi, cc, cr, cop, assocClass,
- role, properties);
+ return KDefaultReferences(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ SystemDevice_ClassName,
+ assocClass,
+ role,
+ properties);
}
static CMPIStatus SystemDeviceReferenceNames(
@@ -173,11 +191,15 @@
const char* assocClass,
const char* role)
{
- if (!assocClass)
- assocClass = "Linux_FanSystemDevice";
-
return KDefaultReferenceNames(
- _cb, mi, cc, cr, cop, assocClass, role);
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ SystemDevice_ClassName,
+ assocClass,
+ role);
}
CMInstanceMIStub(
Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfileProvider.c 2008-08-15 17:01:59 UTC (rev 855)
+++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfileProvider.c 2008-08-15 23:07:51 UTC (rev 856)
@@ -123,11 +123,18 @@
const char* resultRole,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_PowerElementConformsToProfile";
-
- return KDefaultAssociators(_cb, mi, cc, cr, cop, assocClass,
- resultClass, role, resultRole, properties);
+ return KDefaultAssociators(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ElementConformsToProfile_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole,
+ properties);
}
static CMPIStatus ElementConformsToProfileAssociatorNames(
@@ -140,11 +147,17 @@
const char* role,
const char* resultRole)
{
- if (!assocClass)
- assocClass = "Linux_PowerElementConformsToProfile";
-
- return KDefaultAssociatorNames(_cb, mi, cc, cr, cop,
- assocClass, resultClass, role, resultRole);
+ return KDefaultAssociatorNames(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ElementConformsToProfile_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole);
}
static CMPIStatus ElementConformsToProfileReferences(
@@ -156,11 +169,16 @@
const char* role,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_PowerElementConformsToProfile";
-
- return KDefaultReferences(_cb, mi, cc, cr, cop, assocClass,
- role, properties);
+ return KDefaultReferences(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ElementConformsToProfile_ClassName,
+ assocClass,
+ role,
+ properties);
}
static CMPIStatus ElementConformsToProfileReferenceNames(
@@ -171,11 +189,15 @@
const char* assocClass,
const char* role)
{
- if (!assocClass)
- assocClass = "Linux_PowerElementConformsToProfile";
-
return KDefaultReferenceNames(
- _cb, mi, cc, cr, cop, assocClass, role);
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ ElementConformsToProfile_ClassName,
+ assocClass,
+ role);
}
CMInstanceMIStub(
Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/HostedCollectionProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/HostedCollectionProvider.c 2008-08-15 17:01:59 UTC (rev 855)
+++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/HostedCollectionProvider.c 2008-08-15 23:07:51 UTC (rev 856)
@@ -149,11 +149,18 @@
const char* resultRole,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_PowerHostedCollection";
-
- return KDefaultAssociators(_cb, mi, cc, cr, cop, assocClass,
- resultClass, role, resultRole, properties);
+ return KDefaultAssociators(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ HostedCollection_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole,
+ properties);
}
static CMPIStatus HostedCollectionAssociatorNames(
@@ -166,11 +173,17 @@
const char* role,
const char* resultRole)
{
- if (!assocClass)
- assocClass = "Linux_PowerHostedCollection";
-
- return KDefaultAssociatorNames(_cb, mi, cc, cr, cop,
- assocClass, resultClass, role, resultRole);
+ return KDefaultAssociatorNames(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ HostedCollection_ClassName,
+ assocClass,
+ resultClass,
+ role,
+ resultRole);
}
static CMPIStatus HostedCollectionReferences(
@@ -182,11 +195,16 @@
const char* role,
const char** properties)
{
- if (!assocClass)
- assocClass = "Linux_PowerHostedCollection";
-
- return KDefaultReferences(_cb, mi, cc, cr, cop, assocClass,
- role, properties);
+ return KDefaultReferences(
+ _cb,
+ mi,
+ cc,
+ cr,
+ cop,
+ HostedCollection_ClassName,
+ assocClass,
+ role,
+ properties);
}
static CMPIStatus HostedCollectionReferenceNames(
@@ -197,11 +215,15 @@
const char* assocClass,
const char* role)
{
- if (!assocClass)
- assocClass = "Linux_PowerHostedCollection";
-
return KDefaultReferenceNames(
- _cb, mi, cc, cr, cop, assocClass, role);
+ ...
[truncated message content] |
|
From: <np...@us...> - 2008-08-15 17:01:55
|
Revision: 855
http://omc.svn.sourceforge.net/omc/?rev=855&view=rev
Author: npaxton
Date: 2008-08-15 17:01:59 +0000 (Fri, 15 Aug 2008)
Log Message:
-----------
svn:ignore properties
Property Changed:
----------------
cmpiprofiles/
cmpiprofiles/sblim-cmpi-boot_control_profile/
cmpiprofiles/sblim-cmpi-boot_control_profile/branches/
cmpiprofiles/sblim-cmpi-boot_control_profile/tags/
cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/
cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof/
cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/
cmpiprofiles/sblim-cmpi-ethernet_port_profile/
cmpiprofiles/sblim-cmpi-ethernet_port_profile/branches/
cmpiprofiles/sblim-cmpi-ethernet_port_profile/tags/
cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/
cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/
cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/
cmpiprofiles/sblim-cmpi-fan_profile/
cmpiprofiles/sblim-cmpi-fan_profile/branches/
cmpiprofiles/sblim-cmpi-fan_profile/tags/
cmpiprofiles/sblim-cmpi-fan_profile/trunk/
cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/
cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/
cmpiprofiles/sblim-cmpi-power_supply_profile/
cmpiprofiles/sblim-cmpi-power_supply_profile/branches/
cmpiprofiles/sblim-cmpi-power_supply_profile/tags/
cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/
cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/
cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/
cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ref/
cmpiprofiles/sblim-cmpi-ssh_service_profile/
cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/
cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof/
cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/
Property changes on: cmpiprofiles
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
Property changes on: cmpiprofiles/sblim-cmpi-boot_control_profile
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
Property changes on: cmpiprofiles/sblim-cmpi-boot_control_profile/branches
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
Property changes on: cmpiprofiles/sblim-cmpi-boot_control_profile/tags
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
Property changes on: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
Property changes on: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
Property changes on: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
Property changes on: cmpiprofiles/sblim-cmpi-ethernet_port_profile
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
Property changes on: cmpiprofiles/sblim-cmpi-ethernet_port_profile/branches
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
Property changes on: cmpiprofiles/sblim-cmpi-ethernet_port_profile/tags
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
Property changes on: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
Property changes on: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
Property changes on: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
Property changes on: cmpiprofiles/sblim-cmpi-fan_profile
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
Property changes on: cmpiprofiles/sblim-cmpi-fan_profile/branches
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
Property changes on: cmpiprofiles/sblim-cmpi-fan_profile/tags
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
Property changes on: cmpiprofiles/sblim-cmpi-fan_profile/trunk
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
Property changes on: cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
Property changes on: cmpiprofiles/sblim-cmpi-fan_profile/trunk/src
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
Property changes on: cmpiprofiles/sblim-cmpi-power_supply_profile
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
Property changes on: cmpiprofiles/sblim-cmpi-power_supply_profile/branches
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
Property changes on: cmpiprofiles/sblim-cmpi-power_supply_profile/tags
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
Property changes on: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
Property changes on: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
Property changes on: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
Property changes on: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ref
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
Property changes on: cmpiprofiles/sblim-cmpi-ssh_service_profile
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
Property changes on: cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
Property changes on: cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
Property changes on: cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
configure
aclocal.m4
Makefile
autom4te.cache
config.guess
config.log
config.status
config.sub
config.h.in
libtool
ltmain.sh
mybuild
*.vpj
config
depcomp
missing
*.vpw
*.vpwhistu
*.vtg
*.swp
install-sh
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mik...@us...> - 2008-08-14 22:47:42
|
Revision: 854
http://omc.svn.sourceforge.net/omc/?rev=854&view=rev
Author: mike-brasher
Date: 2008-08-14 22:47:51 +0000 (Thu, 14 Aug 2008)
Log Message:
-----------
changed name of internal function.
Modified Paths:
--------------
cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/Resource.c
Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/Resource.c
===================================================================
--- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/Resource.c 2008-08-14 22:44:56 UTC (rev 853)
+++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/Resource.c 2008-08-14 22:47:51 UTC (rev 854)
@@ -199,7 +199,7 @@
return 0;
}
-static int _get(const char* in, const char* name, char* data, size_t size)
+static int _getf(const char* in, const char* name, char* data, size_t size)
{
char* p;
const char* start;
@@ -288,16 +288,16 @@
}
/* Get EthernetPortResource.inet_addr */
- _get(data, "inet addr:", info.inet_addr, sizeof(info.inet_addr));
+ _getf(data, "inet addr:", info.inet_addr, sizeof(info.inet_addr));
/* Get EthernetPortResource.inet_mask */
- _get(data, "Mask:", info.inet_mask, sizeof(info.inet_mask));
+ _getf(data, "Mask:", info.inet_mask, sizeof(info.inet_mask));
/* Get EthernetPortResource.inet_bcast */
- _get(data, "Bcast:", info.inet_bcast, sizeof(info.inet_bcast));
+ _getf(data, "Bcast:", info.inet_bcast, sizeof(info.inet_bcast));
/* Get EthernetPortResource.inet6_addr */
- _get(data, "inet6 addr:", info.inet6_addr,sizeof(info.inet6_addr));
+ _getf(data, "inet6 addr:", info.inet6_addr,sizeof(info.inet6_addr));
/* Get EthernetPortResource.is_up */
info.is_up = strstr(data, " UP ") ? 1 : 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mik...@us...> - 2008-08-14 22:44:46
|
Revision: 853
http://omc.svn.sourceforge.net/omc/?rev=853&view=rev
Author: mike-brasher
Date: 2008-08-14 22:44:56 +0000 (Thu, 14 Aug 2008)
Log Message:
-----------
Switched from "ioctl()" to "ifconfig" to find interfaces.
Modified Paths:
--------------
cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/Resource.c
cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/Resource.h
Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/Resource.c
===================================================================
--- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/Resource.c 2008-08-14 17:52:42 UTC (rev 852)
+++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/Resource.c 2008-08-14 22:44:56 UTC (rev 853)
@@ -13,8 +13,6 @@
#include "common.h"
#include <ifaddrs.h>
-#define MAX_IFREQ 64
-
struct EthtoolInfo
{
/* Non-zero if full duplex */
@@ -35,7 +33,7 @@
const char ETHTOOL[] = "/usr/sbin/ethtool";
char buf[64];
char line[128];
- FILE* os;
+ FILE* is;
int matches = 0;
/* Clear info structure */
@@ -54,12 +52,12 @@
strlcat(buf, name, sizeof(buf));
strlcat(buf, " 2> /dev/null", sizeof(buf));
- if ((os = popen(buf, "r")) == NULL)
+ if ((is = popen(buf, "r")) == NULL)
return -1;
/* Extract selected fields */
- while (fgets(line, sizeof(line), os) != NULL)
+ while (fgets(line, sizeof(line), is) != NULL)
{
char* p = line;
char* q = p + strlen(line);
@@ -102,7 +100,7 @@
}
/* Close stream */
- pclose(os);
+ pclose(is);
return matches ? 0 : -1;
}
@@ -167,24 +165,6 @@
&((struct sockaddr_in6*)p->ifa_addr)->sin6_addr,
info->inet6_addr,
sizeof(info->inet6_addr) - 1);
-
- if(p->ifa_netmask)
- {
- inet_ntop(
- AF_INET6,
- &((struct sockaddr_in6*)p->ifa_netmask)->sin6_addr,
- info->inet6_netmask,
- sizeof(info->inet6_netmask) - 1);
- }
-
- if (p->ifa_broadaddr && p->ifa_flags & IFF_BROADCAST)
- {
- inet_ntop(
- AF_INET6,
- &((struct sockaddr_in6*)p->ifa_broadaddr)->sin6_addr,
- info->inet6_broadcast,
- sizeof(info->inet6_broadcast) - 1);
- }
}
else if(family == AF_INET)
{
@@ -199,8 +179,8 @@
inet_ntop(
AF_INET,
&((struct sockaddr_in*)p->ifa_netmask)->sin_addr,
- info->inet_netmask,
- sizeof(info->inet_netmask) - 1);
+ info->inet_mask,
+ sizeof(info->inet_mask) - 1);
}
if (p->ifa_broadaddr && p->ifa_flags & IFF_BROADCAST)
@@ -208,8 +188,8 @@
inet_ntop(
AF_INET,
&((struct sockaddr_in*)p->ifa_broadaddr)->sin_addr,
- info->inet_broadcast,
- sizeof(info->inet_broadcast) - 1);
+ info->inet_bcast,
+ sizeof(info->inet_bcast) - 1);
}
}
}
@@ -219,8 +199,172 @@
return 0;
}
+static int _get(const char* in, const char* name, char* data, size_t size)
+{
+ char* p;
+ const char* start;
+
+ if (!(p = strstr(in, name)))
+ return -1;
+
+ p += strlen(name);
+
+ while (*p && isspace(*p))
+ p++;
+
+ for (start = p; *p && !isspace(*p); p++)
+ ;
+
+ if (p - start >= size)
+ return -1;
+
+ strncat(data, start, p - start);
+ return 0;
+}
+
struct EthernetPortResource* GetEthernetPortResources()
{
+ struct EthernetPortResource* head = NULL;
+ struct EthernetPortResource* tail = NULL;
+ char data[1024] = { '\0' };
+ FILE* is;
+ char line[1024];
+ struct EthernetPortResource info;
+ struct EthernetPortResource* node;
+
+ /* Run "inconfig -a" to get interface information */
+
+ if ((is = popen("/sbin/ifconfig -a", "r")) == NULL)
+ return NULL;
+
+ /* For each line */
+
+ while (fgets(line, sizeof(line), is) != NULL)
+ {
+ char* p = line;
+ struct EthtoolInfo eti;
+
+ /* Skip leading whitespace */
+
+ while (isspace(*p))
+ p++;
+
+ /* Interface information is separated by blank lines */
+
+ if (*p == '\0')
+ {
+ p = data;
+
+ /* Initialize new info structure */
+ memset(&info, 0, sizeof(info));
+
+ /* Get EthernetPortResource.name */
+
+ while (*p && !isspace(*p))
+ p++;
+
+ *info.name = '\0';
+ strncat(info.name, data, p - data);
+
+ /* Skip non-ethernet interfaces */
+
+ if (!(p = strstr(data, "encap:Ethernet")))
+ {
+ data[0] = '\0';
+ continue;
+ }
+
+ /* Get EthernetPortResource.index */
+
+ info.index = if_nametoindex(info.name);
+
+ /* Get EthernetPortResource.mac "HWaddr 00:50:56:C0:00:01" */
+
+ if ((p = strstr(data, "HWaddr ")))
+ {
+ p+= 7;
+ sprintf(info.mac, "%c%c%c%c%c%c%c%c%c%c%c%c", p[0], p[1], p[3],
+ p[4], p[6], p[7], p[9], p[10], p[12], p[13], p[15], p[16]);
+ }
+
+ /* Get EthernetPortResource.inet_addr */
+ _get(data, "inet addr:", info.inet_addr, sizeof(info.inet_addr));
+
+ /* Get EthernetPortResource.inet_mask */
+ _get(data, "Mask:", info.inet_mask, sizeof(info.inet_mask));
+
+ /* Get EthernetPortResource.inet_bcast */
+ _get(data, "Bcast:", info.inet_bcast, sizeof(info.inet_bcast));
+
+ /* Get EthernetPortResource.inet6_addr */
+ _get(data, "inet6 addr:", info.inet6_addr,sizeof(info.inet6_addr));
+
+ /* Get EthernetPortResource.is_up */
+ info.is_up = strstr(data, " UP ") ? 1 : 0;
+
+ /* Get EthernetPortResource.is_bcast */
+ info.is_bcast = strstr(data, " BROADCAST ") ? 1 : 0;
+
+ /* Get EthernetPortResource.is_multicast */
+ info.is_multicast = strstr(data, " MULTICAST ") ? 1 : 0;
+
+ /* Get additional information using the ethtool program */
+
+ if (_ethtool(&eti, info.name) == 0)
+ {
+ info.speed_mbps = eti.speed_mbps;
+ info.full_duplex = eti.full_duplex;
+ info.supports_wake_on = eti.supports_wake_on;
+ info.wake_on = eti.wake_on;
+ }
+
+ /* Append to list */
+
+ node = (struct EthernetPortResource*)malloc(
+ sizeof(struct EthernetPortResource));
+
+ if (!node)
+ {
+ pclose(is);
+ return NULL;
+ }
+
+ memcpy(node, &info, sizeof(info));
+
+ if (tail)
+ {
+ tail->next = node;
+ tail = node;
+ }
+ else
+ {
+ tail = node;
+ head = node;
+ }
+
+ /* Zero out data and info for next one */
+
+ data[0] = '\0';
+ memset(&info, 0, sizeof(info));
+ continue;
+ }
+
+ /* Save data */
+ strlcat(data, line, sizeof(data));
+ }
+
+ /* Close stream */
+ pclose(is);
+
+ /* Set address info for all elements in this list */
+ _fixup_addrs(head);
+
+ return head;
+}
+
+#if 0
+struct EthernetPortResource* GetEthernetPortResources()
+{
int sock;
int len;
int prev_len;
@@ -350,7 +494,7 @@
/* Set the flags */
info.is_up = flags & IFF_UP ? 1 : 0;
- info.is_broadcast = flags & IFF_BROADCAST ? 1 : 0;
+ info.is_bcast = flags & IFF_BROADCAST ? 1 : 0;
info.is_multicast = flags & IFF_MULTICAST ? 1 : 0;
info.is_loopback = flags & IFF_LOOPBACK ? 1 : 0;
info.is_loopback = flags & IFF_LOOPBACK ? 1 : 0;
@@ -418,7 +562,7 @@
in = (struct sockaddr_in*)&tmp.ifr_addr;
inet_ntop(tmp.ifr_addr.sa_family, &in->sin_addr, str, sizeof(str));
- strlcpy(info.inet_broadcast, str, sizeof(info.inet_broadcast));
+ strlcpy(info.inet_bcast, str, sizeof(info.inet_bcast));
}
/* Get EthernetPortResource.netmask */
@@ -438,7 +582,7 @@
in = (struct sockaddr_in*)&tmp.ifr_addr;
inet_ntop(tmp.ifr_addr.sa_family, &in->sin_addr, str, sizeof(str));
- strlcpy(info.inet_netmask, str, sizeof(info.inet_netmask));
+ strlcpy(info.inet_mask, str, sizeof(info.inet_mask));
}
#endif
@@ -484,6 +628,7 @@
return head;
}
+#endif
void FreeEthernetPortResources(struct EthernetPortResource* head)
{
@@ -509,16 +654,12 @@
printf(" index{%d}\n", p->index);
printf(" mac{%s}\n", p->mac);
printf(" inet_addr{%s}\n", p->inet_addr);
- printf(" inet_netmask{%s}\n", p->inet_netmask);
- printf(" inet_broadcast{%s}\n", p->inet_broadcast);
+ printf(" inet_mask{%s}\n", p->inet_mask);
+ printf(" inet_bcast{%s}\n", p->inet_bcast);
printf(" inet6_addr{%s}\n", p->inet6_addr);
- printf(" inet6_netmask{%s}\n", p->inet6_netmask);
- printf(" inet6_broadcast{%s}\n", p->inet6_broadcast);
printf(" is_up{%d}\n", p->is_up);
- printf(" is_broadcast{%d}\n", p->is_broadcast);
+ printf(" is_bcast{%d}\n", p->is_bcast);
printf(" is_multicast{%d}\n", p->is_multicast);
- printf(" is_loopback{%d}\n", p->is_loopback);
- printf(" is_p2p{%d}\n", p->is_p2p);
printf(" full_duplex{%d}\n", p->full_duplex);
printf(" speed_mbps{%d}\n", p->speed_mbps);
printf(" supports_wake_on{%d}\n", p->supports_wake_on);
Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/Resource.h
===================================================================
--- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/Resource.h 2008-08-14 17:52:42 UTC (rev 852)
+++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/Resource.h 2008-08-14 22:44:56 UTC (rev 853)
@@ -26,35 +26,23 @@
int is_up;
/* Non-zero if broadcast */
- int is_broadcast;
+ int is_bcast;
/* Non-zero if multicast */
int is_multicast ;
- /* Non-zero if loopback */
- int is_loopback;
-
- /* Non-zero if p2p */
- int is_p2p;
-
/* ASCII IPV4 address */
char inet_addr[128];
/* ASCII IPV4 broadcast address */
- char inet_broadcast[128];
+ char inet_bcast[128];
/* ASCII IPV4 Netmask */
- char inet_netmask[128];
+ char inet_mask[128];
/* ASCII IPV6 address */
char inet6_addr[128];
- /* ASCII IPV6 broadcast address */
- char inet6_broadcast[128];
-
- /* ASCII IPV6 Netmask */
- char inet6_netmask[128];
-
/* Non-zero if full duplex */
int full_duplex;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <np...@us...> - 2008-08-14 17:52:33
|
Revision: 852
http://omc.svn.sourceforge.net/omc/?rev=852&view=rev
Author: npaxton
Date: 2008-08-14 17:52:42 +0000 (Thu, 14 Aug 2008)
Log Message:
-----------
converted .registration file to .reg file for new registration scheme
Modified Paths:
--------------
contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.registration
Modified: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.registration
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.registration 2008-08-14 17:51:28 UTC (rev 851)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.registration 2008-08-14 17:52:42 UTC (rev 852)
@@ -4,6 +4,10 @@
# ProviderModule: Library name without lib prefix or .so suffix
# ProviderTypes: instance association method indication
+# NOTE: This file is obsolete... changes may be made here, but MUST be also made to
+# corresponding .reg file
+# This file is no longer used for provider registration
+
XEN_VMBuilderService root/cimv2 cmpixenvmbuilder cmpixenvmbuilder instance method
XEN_VMBuilderHostedService root/cimv2 cmpixenvmbuilder cmpixenvmbuilder instance association
XEN_VMBuilderJob root/cimv2 cmpixenvmbuilderjob cmpixenvmbuilderjob instance method
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <np...@us...> - 2008-08-14 17:51:17
|
Revision: 851
http://omc.svn.sourceforge.net/omc/?rev=851&view=rev
Author: npaxton
Date: 2008-08-14 17:51:28 +0000 (Thu, 14 Aug 2008)
Log Message:
-----------
converted .registration file to .reg file for new registration scheme
Added Paths:
-----------
contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.reg
Added: contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.reg
===================================================================
--- contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.reg (rev 0)
+++ contrib/xen-vm-builder/trunk/mof/XEN_VMBuilder.reg 2008-08-14 17:51:28 UTC (rev 851)
@@ -0,0 +1,42 @@
+[XEN_VMBuilderService]
+ provider: cmpixenvmbuilder
+ location: cmpixenvmbuilder
+ type: instance method
+ namespace: root/cimv2
+#
+[XEN_VMBuilderHostedService]
+ provider: cmpixenvmbuilder
+ location: cmpixenvmbuilder
+ type: instance association
+ namespace: root/cimv2
+#
+[XEN_VMBuilderJob]
+ provider: cmpixenvmbuilderjob
+ location: cmpixenvmbuilderjob
+ type: instance method
+ namespace: root/cimv2
+#
+[XEN_VMBuilderProcessOfJob]
+ provider: cmpixenvmbuilderjob
+ location: cmpixenvmbuilderjob
+ type: instance association
+ namespace: root/cimv2
+#
+[XEN_VMBuilderOwningJobElement]
+ provider: cmpixenowningjob
+ location: cmpixenowningjob
+ type: instance association
+ namespace: root/cimv2
+#
+[XEN_VMBuilderVirtualSystemCreationData]
+ provider: cmpixencreationdata
+ location: cmpixencreationdata
+ type: instance
+ namespace: root/cimv2
+#
+[XEN_SettingsDefineBuild]
+ provider: cmpixensettingsdefinebuild
+ location: cmpixensettingsdefinebuild
+ type: instance association
+ namespace: root/cimv2
+#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <np...@us...> - 2008-08-13 21:27:35
|
Revision: 850
http://omc.svn.sourceforge.net/omc/?rev=850&view=rev
Author: npaxton
Date: 2008-08-13 21:27:41 +0000 (Wed, 13 Aug 2008)
Log Message:
-----------
add .reg files to Makefiles to be included in tarball
Modified Paths:
--------------
cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof/Makefile.am
cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/Makefile.am
cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/Makefile.am
cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/Makefile.am
cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof/Makefile.am
Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof/Makefile.am
===================================================================
--- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof/Makefile.am 2008-08-13 18:56:29 UTC (rev 849)
+++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof/Makefile.am 2008-08-13 21:27:41 UTC (rev 850)
@@ -1,7 +1,8 @@
mof_DATA = \
linux-boot-control-profile-interop.mof \
linux-boot-control-profile.mof \
- linux-boot-control-profile.registration
+ linux-boot-control-profile.registration \
+ linux-boot-control-profile.reg
mofdir = $(datadir)/mof/$(PACKAGE_NAME)
Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/Makefile.am
===================================================================
--- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/Makefile.am 2008-08-13 18:56:29 UTC (rev 849)
+++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/Makefile.am 2008-08-13 21:27:41 UTC (rev 850)
@@ -1,7 +1,8 @@
mof_DATA = \
linux-ethernet-port-profile.mof \
linux-ethernet-port-profile-interop.mof \
- linux-ethernet-port-profile.registration
+ linux-ethernet-port-profile.registration \
+ linux-ethernet-port-profile.reg
mofdir = $(datadir)/mof/$(PACKAGE_NAME)
Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/Makefile.am
===================================================================
--- cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/Makefile.am 2008-08-13 18:56:29 UTC (rev 849)
+++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/Makefile.am 2008-08-13 21:27:41 UTC (rev 850)
@@ -1,7 +1,8 @@
mof_DATA = \
linux-fan-profile.mof \
linux-fan-profile-interop.mof \
- linux-fan-profile.registration
+ linux-fan-profile.registration \
+ linux-fan-profile.reg
mofdir = $(datadir)/mof/$(PACKAGE_NAME)
Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/Makefile.am
===================================================================
--- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/Makefile.am 2008-08-13 18:56:29 UTC (rev 849)
+++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/Makefile.am 2008-08-13 21:27:41 UTC (rev 850)
@@ -1,7 +1,8 @@
mof_DATA = \
linux-power-supply-profile-interop.mof \
linux-power-supply-profile.mof \
- linux-power-supply-profile.registration
+ linux-power-supply-profile.registration \
+ linux-power-supply-profile.reg
mofdir = $(datadir)/mof/$(PACKAGE_NAME)
Modified: cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof/Makefile.am
===================================================================
--- cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof/Makefile.am 2008-08-13 18:56:29 UTC (rev 849)
+++ cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof/Makefile.am 2008-08-13 21:27:41 UTC (rev 850)
@@ -1,7 +1,8 @@
mof_DATA = \
linux-ssh-service-profile-interop.mof \
linux-ssh-service-profile.mof \
- linux-ssh-service-profile.registration
+ linux-ssh-service-profile.registration \
+ linux-ssh-service-profile.reg
mofdir = $(datadir)/mof/$(PACKAGE_NAME)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mik...@us...> - 2008-08-13 18:56:21
|
Revision: 849
http://omc.svn.sourceforge.net/omc/?rev=849&view=rev
Author: mike-brasher
Date: 2008-08-13 18:56:29 +0000 (Wed, 13 Aug 2008)
Log Message:
-----------
Updated namespace/class mappings.
Modified Paths:
--------------
cmpiprofiles/test/trunk/ProviderList.txt
Modified: cmpiprofiles/test/trunk/ProviderList.txt
===================================================================
--- cmpiprofiles/test/trunk/ProviderList.txt 2008-08-13 18:36:31 UTC (rev 848)
+++ cmpiprofiles/test/trunk/ProviderList.txt 2008-08-13 18:56:29 UTC (rev 849)
@@ -7,9 +7,7 @@
Linux_BootElementSettingData
Linux_BootHostedService
Linux_BootOrderedComponent
-Linux_BootReferencedProfile
Linux_BootReferencedProfile root/interop
-Linux_BootRegisteredProfile
Linux_BootRegisteredProfile root/interop
Linux_BootServiceAffectsElement
Linux_GrubBootSourceSetting
@@ -24,9 +22,7 @@
Linux_EthernetPort
Linux_HostedAccessPointEthernetPort
Linux_LANEndpoint
-Linux_ReferencedProfileEthernetPort
Linux_ReferencedProfileEthernetPort root/interop
-Linux_RegisteredProfileEthernetPort
Linux_RegisteredProfileEthernetPort root/interop
Linux_SystemDeviceEthernetPort
@@ -38,9 +34,7 @@
Linux_FanMemberOfCollection
Linux_FanOwningCollectionElement
Linux_FanRedundancySet
-Linux_FanReferencedProfile
Linux_FanReferencedProfile root/interop
-Linux_FanRegisteredProfile
Linux_FanRegisteredProfile root/interop
Linux_FanSystemDevice
@@ -52,9 +46,7 @@
Linux_PowerOwningCollectionElement
Linux_PowerSupply
Linux_PowerRedundancySet
-Linux_PowerReferencedProfile
Linux_PowerReferencedProfile root/interop
-Linux_PowerRegisteredProfile
Linux_PowerRegisteredProfile root/interop
Linux_PowerSystemDevice
@@ -67,8 +59,6 @@
Linux_SSHProtocolEndpoint
Linux_SSHProtocolService
Linux_SSHProvidesEndpoint
-Linux_SSHReferencedProfile
Linux_SSHReferencedProfile root/interop
-Linux_SSHRegisteredProfile
Linux_SSHRegisteredProfile root/interop
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mik...@us...> - 2008-08-13 18:36:22
|
Revision: 848
http://omc.svn.sourceforge.net/omc/?rev=848&view=rev
Author: mike-brasher
Date: 2008-08-13 18:36:31 +0000 (Wed, 13 Aug 2008)
Log Message:
-----------
Added registration script to register all providers (for testing).
Added Paths:
-----------
cmpiprofiles/register.sh
Added: cmpiprofiles/register.sh
===================================================================
--- cmpiprofiles/register.sh (rev 0)
+++ cmpiprofiles/register.sh 2008-08-13 18:36:31 UTC (rev 848)
@@ -0,0 +1,7 @@
+#!/bin/sh
+( cd ./sblim-cmpi-power_supply_profile/trunk/mof ; ./register.sh )
+( cd ./sblim-cmpi-power_supply_profile/trunk/mof ; ./register.sh )
+( cd ./sblim-cmpi-boot_control_profile/trunk/mof ; ./register.sh )
+( cd ./sblim-cmpi-ethernet_port_profile/trunk/mof ; ./register.sh )
+( cd ./sblim-cmpi-ssh_service_profile/trunk/mof ; ./register.sh )
+( cd ./sblim-cmpi-fan_profile/trunk/mof ; ./register.sh )
Property changes on: cmpiprofiles/register.sh
___________________________________________________________________
Added: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mik...@us...> - 2008-08-13 18:33:05
|
Revision: 847
http://omc.svn.sourceforge.net/omc/?rev=847&view=rev
Author: mike-brasher
Date: 2008-08-13 18:33:11 +0000 (Wed, 13 Aug 2008)
Log Message:
-----------
Namespace re-organziation.
Modified Paths:
--------------
cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ReferencedProfileProvider.c
cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/RegisteredProfileProvider.c
cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/ReferencedProfileProvider.c
cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/RegisteredProfileProvider.c
Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ReferencedProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ReferencedProfileProvider.c 2008-08-13 18:30:31 UTC (rev 846)
+++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ReferencedProfileProvider.c 2008-08-13 18:33:11 UTC (rev 847)
@@ -195,7 +195,7 @@
ReferencedProfileInitialize())
KONKRET_REGISTRATION(
- "root/cimv2",
+ "root/interop",
"Linux_BootReferencedProfile",
"Linux_BootReferencedProfile",
"instance association");
Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/RegisteredProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/RegisteredProfileProvider.c 2008-08-13 18:30:31 UTC (rev 846)
+++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/RegisteredProfileProvider.c 2008-08-13 18:33:11 UTC (rev 847)
@@ -132,7 +132,7 @@
RegisteredProfileInitialize())
KONKRET_REGISTRATION(
- "root/cimv2",
+ "root/interop",
"Linux_BootRegisteredProfile",
"Linux_BootRegisteredProfile",
"instance method");
Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/ReferencedProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/ReferencedProfileProvider.c 2008-08-13 18:30:31 UTC (rev 846)
+++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/ReferencedProfileProvider.c 2008-08-13 18:33:11 UTC (rev 847)
@@ -195,7 +195,7 @@
ReferencedProfileInitialize())
KONKRET_REGISTRATION(
- "root/cimv2",
+ "root/interop",
"Linux_FanReferencedProfile",
"Linux_FanReferencedProfile",
"instance association");
Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/RegisteredProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/RegisteredProfileProvider.c 2008-08-13 18:30:31 UTC (rev 846)
+++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/RegisteredProfileProvider.c 2008-08-13 18:33:11 UTC (rev 847)
@@ -132,7 +132,7 @@
RegisteredProfileInitialize())
KONKRET_REGISTRATION(
- "root/cimv2",
+ "root/interop",
"Linux_FanRegisteredProfile",
"Linux_FanRegisteredProfile",
"instance method");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mik...@us...> - 2008-08-13 18:30:31
|
Revision: 846
http://omc.svn.sourceforge.net/omc/?rev=846&view=rev
Author: mike-brasher
Date: 2008-08-13 18:30:31 +0000 (Wed, 13 Aug 2008)
Log Message:
-----------
Namespace re-organization.
Modified Paths:
--------------
cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile-interop.mof
cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.reg
cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.registration
cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfile.h
cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfileProvider.c
cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ReferencedProfileProvider.c
cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RegisteredProfileProvider.c
cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/Resource.h
cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof/linux-ssh-service-profile-interop.mof
cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof/linux-ssh-service-profile.reg
cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof/linux-ssh-service-profile.registration
cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ElementConformsToProfile.h
cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ElementConformsToProfileProvider.c
cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ReferencedProfileProvider.c
cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/RegisteredProfileProvider.c
cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/Resource.h
Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile-interop.mof
===================================================================
--- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile-interop.mof 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile-interop.mof 2008-08-13 18:30:31 UTC (rev 846)
@@ -7,7 +7,7 @@
class Linux_PowerElementConformsToProfile : CIM_ElementConformsToProfile
{
[Key] Linux_PowerRegisteredProfile REF ConformantStandard;
- [Key] Linux_PowerSupply REF ManagedElement;
+ // [Key] Linux_PowerSupply REF ManagedElement;
};
[Association]
Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.reg
===================================================================
--- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.reg 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.reg 2008-08-13 18:30:31 UTC (rev 846)
@@ -44,13 +44,13 @@
provider: Linux_PowerReferencedProfile
location: linux_powersupplyprovider
type: instance association
- namespace: root/cimv2 root/cimv2
+ namespace: root/interop
#
[Linux_PowerRegisteredProfile]
provider: Linux_PowerRegisteredProfile
location: linux_powersupplyprovider
type: instance method
- namespace: root/cimv2 root/interop
+ namespace: root/interop
#
[Linux_PowerSystemDevice]
provider: Linux_PowerSystemDevice
Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.registration
===================================================================
--- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.registration 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/mof/linux-power-supply-profile.registration 2008-08-13 18:30:31 UTC (rev 846)
@@ -5,6 +5,6 @@
Linux_PowerOwningCollectionElement root/cimv2 Linux_PowerOwningCollectionElement linux_powersupplyprovider instance association
Linux_PowerSupply root/cimv2 Linux_PowerSupply linux_powersupplyprovider instance method
Linux_PowerRedundancySet root/cimv2 Linux_PowerRedundancySet linux_powersupplyprovider instance method
-Linux_PowerReferencedProfile root/cimv2\ root/cimv2 Linux_PowerReferencedProfile linux_powersupplyprovider instance association
-Linux_PowerRegisteredProfile root/cimv2\ root/interop Linux_PowerRegisteredProfile linux_powersupplyprovider instance method
+Linux_PowerReferencedProfile root/interop Linux_PowerReferencedProfile linux_powersupplyprovider instance association
+Linux_PowerRegisteredProfile root/interop Linux_PowerRegisteredProfile linux_powersupplyprovider instance method
Linux_PowerSystemDevice root/cimv2 Linux_PowerSystemDevice linux_powersupplyprovider instance association
Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfile.h
===================================================================
--- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfile.h 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfile.h 2008-08-13 18:30:31 UTC (rev 846)
@@ -11,7 +11,7 @@
#include <konkret/konkret.h>
#include "RegisteredProfile.h"
-#include "PowerSupply.h"
+#include "CIM_ManagedElement.h"
/*
**==============================================================================
@@ -27,7 +27,7 @@
KBase __base;
/* CIM_ElementConformsToProfile features */
const KRef ConformantStandard; /* RegisteredProfile */
- const KRef ManagedElement; /* PowerSupply */
+ const KRef ManagedElement; /* CIM_ManagedElement */
/* Linux_PowerElementConformsToProfile features */
}
ElementConformsToProfileRef;
@@ -50,7 +50,7 @@
const unsigned char* sig = __ElementConformsToProfileRef_sig;
KBase_Init(&self->__base, cb, sizeof(*self), sig, ns);
((KRef*)&self->ConformantStandard)->__sig = __RegisteredProfile_sig;
- ((KRef*)&self->ManagedElement)->__sig = __PowerSupply_sig;
+ ((KRef*)&self->ManagedElement)->__sig = __CIM_ManagedElement_sig;
}
KINLINE CMPIStatus ElementConformsToProfileRef_InitFromInstance(
@@ -156,7 +156,7 @@
KINLINE CMPIStatus ElementConformsToProfileRef_Set_ManagedElement(
ElementConformsToProfileRef* self,
- const PowerSupplyRef* x)
+ const CIM_ManagedElementRef* x)
{
if (self && self->__base.magic == KMAGIC)
{
@@ -200,7 +200,7 @@
KBase __base;
/* CIM_ElementConformsToProfile features */
const KRef ConformantStandard; /* RegisteredProfile */
- const KRef ManagedElement; /* PowerSupply */
+ const KRef ManagedElement; /* CIM_ManagedElement */
/* Linux_PowerElementConformsToProfile features */
}
ElementConformsToProfile;
@@ -223,7 +223,7 @@
const unsigned char* sig = __ElementConformsToProfile_sig;
KBase_Init(&self->__base, cb, sizeof(*self), sig, ns);
((KRef*)&self->ConformantStandard)->__sig = __RegisteredProfile_sig;
- ((KRef*)&self->ManagedElement)->__sig = __PowerSupply_sig;
+ ((KRef*)&self->ManagedElement)->__sig = __CIM_ManagedElement_sig;
}
KINLINE CMPIStatus ElementConformsToProfile_InitFromInstance(
@@ -329,7 +329,7 @@
KINLINE CMPIStatus ElementConformsToProfile_Set_ManagedElement(
ElementConformsToProfile* self,
- const PowerSupplyRef* x)
+ const CIM_ManagedElementRef* x)
{
if (self && self->__base.magic == KMAGIC)
{
Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfileProvider.c 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ElementConformsToProfileProvider.c 2008-08-13 18:30:31 UTC (rev 846)
@@ -33,7 +33,7 @@
const CMPIObjectPath* cop,
const char** properties)
{
- const char* ns = KNameSpace(cop);
+ const char* ns = INTEROP_NAMESPACE;
RegisteredProfileRef cs;
/* Linux_FanRegisteredProfile.ConformantStandard */
Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ReferencedProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ReferencedProfileProvider.c 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/ReferencedProfileProvider.c 2008-08-13 18:30:31 UTC (rev 846)
@@ -195,7 +195,7 @@
ReferencedProfileInitialize())
KONKRET_REGISTRATION(
- "root/cimv2 root/cimv2",
+ "root/interop",
"Linux_PowerReferencedProfile",
"Linux_PowerReferencedProfile",
"instance association");
Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RegisteredProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RegisteredProfileProvider.c 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/RegisteredProfileProvider.c 2008-08-13 18:30:31 UTC (rev 846)
@@ -132,7 +132,7 @@
RegisteredProfileInitialize())
KONKRET_REGISTRATION(
- "root/cimv2 root/interop",
+ "root/interop",
"Linux_PowerRegisteredProfile",
"Linux_PowerRegisteredProfile",
"instance method");
Modified: cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/Resource.h
===================================================================
--- cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/Resource.h 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-power_supply_profile/trunk/src/Resource.h 2008-08-13 18:30:31 UTC (rev 846)
@@ -14,6 +14,7 @@
#endif
#define NAMESPACE "root/cimv2"
+#define INTEROP_NAMESPACE "root/interop"
typedef struct _Str256
{
Modified: cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof/linux-ssh-service-profile-interop.mof
===================================================================
--- cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof/linux-ssh-service-profile-interop.mof 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof/linux-ssh-service-profile-interop.mof 2008-08-13 18:30:31 UTC (rev 846)
@@ -6,7 +6,7 @@
class Linux_SSHElementConformsToProfile : CIM_ElementConformsToProfile
{
[Key] Linux_SSHRegisteredProfile REF ConformantStandard;
- [Key] Linux_SSHProtocolService REF ManagedElement;
+ // [Key] Linux_SSHProtocolService REF ManagedElement;
};
[Association]
Modified: cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof/linux-ssh-service-profile.reg
===================================================================
--- cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof/linux-ssh-service-profile.reg 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof/linux-ssh-service-profile.reg 2008-08-13 18:30:31 UTC (rev 846)
@@ -50,11 +50,11 @@
provider: Linux_SSHReferencedProfile
location: linux_sshserviceprovider
type: instance association
- namespace: root/cimv2 root/interop
+ namespace: root/interop
#
[Linux_SSHRegisteredProfile]
provider: Linux_SSHRegisteredProfile
location: linux_sshserviceprovider
type: instance method
- namespace: root/cimv2 root/interop
+ namespace: root/interop
#
Modified: cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof/linux-ssh-service-profile.registration
===================================================================
--- cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof/linux-ssh-service-profile.registration 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/mof/linux-ssh-service-profile.registration 2008-08-13 18:30:31 UTC (rev 846)
@@ -6,5 +6,5 @@
Linux_SSHProtocolEndpoint root/cimv2 Linux_SSHProtocolEndpoint linux_sshserviceprovider instance method
Linux_SSHProtocolService root/cimv2 Linux_SSHProtocolService linux_sshserviceprovider instance method
Linux_SSHProvidesEndpoint root/cimv2 Linux_SSHProvidesEndpoint linux_sshserviceprovider instance association
-Linux_SSHReferencedProfile root/cimv2\ root/interop Linux_SSHReferencedProfile linux_sshserviceprovider instance association
-Linux_SSHRegisteredProfile root/cimv2\ root/interop Linux_SSHRegisteredProfile linux_sshserviceprovider instance method
+Linux_SSHReferencedProfile root/interop Linux_SSHReferencedProfile linux_sshserviceprovider instance association
+Linux_SSHRegisteredProfile root/interop Linux_SSHRegisteredProfile linux_sshserviceprovider instance method
Modified: cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ElementConformsToProfile.h
===================================================================
--- cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ElementConformsToProfile.h 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ElementConformsToProfile.h 2008-08-13 18:30:31 UTC (rev 846)
@@ -11,7 +11,7 @@
#include <konkret/konkret.h>
#include "RegisteredProfile.h"
-#include "ProtocolService.h"
+#include "CIM_ManagedElement.h"
/*
**==============================================================================
@@ -27,7 +27,7 @@
KBase __base;
/* CIM_ElementConformsToProfile features */
const KRef ConformantStandard; /* RegisteredProfile */
- const KRef ManagedElement; /* ProtocolService */
+ const KRef ManagedElement; /* CIM_ManagedElement */
/* Linux_SSHElementConformsToProfile features */
}
ElementConformsToProfileRef;
@@ -49,7 +49,7 @@
const unsigned char* sig = __ElementConformsToProfileRef_sig;
KBase_Init(&self->__base, cb, sizeof(*self), sig, ns);
((KRef*)&self->ConformantStandard)->__sig = __RegisteredProfile_sig;
- ((KRef*)&self->ManagedElement)->__sig = __ProtocolService_sig;
+ ((KRef*)&self->ManagedElement)->__sig = __CIM_ManagedElement_sig;
}
KINLINE CMPIStatus ElementConformsToProfileRef_InitFromInstance(
@@ -155,7 +155,7 @@
KINLINE CMPIStatus ElementConformsToProfileRef_Set_ManagedElement(
ElementConformsToProfileRef* self,
- const ProtocolServiceRef* x)
+ const CIM_ManagedElementRef* x)
{
if (self && self->__base.magic == KMAGIC)
{
@@ -199,7 +199,7 @@
KBase __base;
/* CIM_ElementConformsToProfile features */
const KRef ConformantStandard; /* RegisteredProfile */
- const KRef ManagedElement; /* ProtocolService */
+ const KRef ManagedElement; /* CIM_ManagedElement */
/* Linux_SSHElementConformsToProfile features */
}
ElementConformsToProfile;
@@ -221,7 +221,7 @@
const unsigned char* sig = __ElementConformsToProfile_sig;
KBase_Init(&self->__base, cb, sizeof(*self), sig, ns);
((KRef*)&self->ConformantStandard)->__sig = __RegisteredProfile_sig;
- ((KRef*)&self->ManagedElement)->__sig = __ProtocolService_sig;
+ ((KRef*)&self->ManagedElement)->__sig = __CIM_ManagedElement_sig;
}
KINLINE CMPIStatus ElementConformsToProfile_InitFromInstance(
@@ -327,7 +327,7 @@
KINLINE CMPIStatus ElementConformsToProfile_Set_ManagedElement(
ElementConformsToProfile* self,
- const ProtocolServiceRef* x)
+ const CIM_ManagedElementRef* x)
{
if (self && self->__base.magic == KMAGIC)
{
Modified: cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ElementConformsToProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ElementConformsToProfileProvider.c 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ElementConformsToProfileProvider.c 2008-08-13 18:30:31 UTC (rev 846)
@@ -33,7 +33,7 @@
const CMPIObjectPath* cop,
const char** properties)
{
- const char* ns = KNameSpace(cop);
+ const char* ns = INTEROP_NAMESPACE;
RegisteredProfileRef cs;
/* Linux_SSHRegisteredProfile.ConformantStandard */
Modified: cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ReferencedProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ReferencedProfileProvider.c 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/ReferencedProfileProvider.c 2008-08-13 18:30:31 UTC (rev 846)
@@ -195,7 +195,7 @@
ReferencedProfileInitialize())
KONKRET_REGISTRATION(
- "root/cimv2 root/interop",
+ "root/interop",
"Linux_SSHReferencedProfile",
"Linux_SSHReferencedProfile",
"instance association");
Modified: cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/RegisteredProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/RegisteredProfileProvider.c 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/RegisteredProfileProvider.c 2008-08-13 18:30:31 UTC (rev 846)
@@ -132,7 +132,7 @@
RegisteredProfileInitialize())
KONKRET_REGISTRATION(
- "root/cimv2 root/interop",
+ "root/interop",
"Linux_SSHRegisteredProfile",
"Linux_SSHRegisteredProfile",
"instance method");
Modified: cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/Resource.h
===================================================================
--- cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/Resource.h 2008-08-13 18:25:08 UTC (rev 845)
+++ cmpiprofiles/sblim-cmpi-ssh_service_profile/trunk/src/Resource.h 2008-08-13 18:30:31 UTC (rev 846)
@@ -12,6 +12,7 @@
#define HIDDEN __attribute__((visibility("hidden")))
#define NAMESPACE "root/cimv2"
+#define INTEROP_NAMESPACE "root/interop"
/* Returns 0 if sshd service is running */
HIDDEN int GetSSHDStatus();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mik...@us...> - 2008-08-13 18:25:03
|
Revision: 845
http://omc.svn.sourceforge.net/omc/?rev=845&view=rev
Author: mike-brasher
Date: 2008-08-13 18:25:08 +0000 (Wed, 13 Aug 2008)
Log Message:
-----------
Reassigned instances to proper namespaces.
Modified Paths:
--------------
cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile-interop.mof
cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile.reg
cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile.registration
cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/ElementConformsToProfile.h
cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/ElementConformsToProfileProvider.c
cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/ReferencedProfileProvider.c
cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/RegisteredProfileProvider.c
cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/Resource.h
Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile-interop.mof
===================================================================
--- cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile-interop.mof 2008-08-13 18:18:45 UTC (rev 844)
+++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile-interop.mof 2008-08-13 18:25:08 UTC (rev 845)
@@ -6,7 +6,7 @@
class Linux_FanElementConformsToProfile : CIM_ElementConformsToProfile
{
[Key] Linux_FanRegisteredProfile REF ConformantStandard;
- [Key] Linux_Fan REF ManagedElement;
+ // [Key] Linux_Fan REF ManagedElement;
};
[Association]
Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile.reg
===================================================================
--- cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile.reg 2008-08-13 18:18:45 UTC (rev 844)
+++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile.reg 2008-08-13 18:25:08 UTC (rev 845)
@@ -44,13 +44,13 @@
provider: Linux_FanReferencedProfile
location: linux_fanprovider
type: instance association
- namespace: root/cimv2 root/interop
+ namespace: root/cimv2
#
[Linux_FanRegisteredProfile]
provider: Linux_FanRegisteredProfile
location: linux_fanprovider
type: instance method
- namespace: root/cimv2 root/interop
+ namespace: root/cimv2
#
[Linux_FanSystemDevice]
provider: Linux_FanSystemDevice
Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile.registration
===================================================================
--- cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile.registration 2008-08-13 18:18:45 UTC (rev 844)
+++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/mof/linux-fan-profile.registration 2008-08-13 18:25:08 UTC (rev 845)
@@ -5,6 +5,6 @@
Linux_FanMemberOfCollection root/cimv2 Linux_FanMemberOfCollection linux_fanprovider instance association
Linux_FanOwningCollectionElement root/cimv2 Linux_FanOwningCollectionElement linux_fanprovider instance association
Linux_FanRedundancySet root/cimv2 Linux_FanRedundancySet linux_fanprovider instance method
-Linux_FanReferencedProfile root/cimv2\ root/interop Linux_FanReferencedProfile linux_fanprovider instance association
-Linux_FanRegisteredProfile root/cimv2\ root/interop Linux_FanRegisteredProfile linux_fanprovider instance method
+Linux_FanReferencedProfile root/cimv2 Linux_FanReferencedProfile linux_fanprovider instance association
+Linux_FanRegisteredProfile root/cimv2 Linux_FanRegisteredProfile linux_fanprovider instance method
Linux_FanSystemDevice root/cimv2 Linux_FanSystemDevice linux_fanprovider instance association
Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/ElementConformsToProfile.h
===================================================================
--- cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/ElementConformsToProfile.h 2008-08-13 18:18:45 UTC (rev 844)
+++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/ElementConformsToProfile.h 2008-08-13 18:25:08 UTC (rev 845)
@@ -11,7 +11,7 @@
#include <konkret/konkret.h>
#include "RegisteredProfile.h"
-#include "Fan.h"
+#include "CIM_ManagedElement.h"
/*
**==============================================================================
@@ -27,7 +27,7 @@
KBase __base;
/* CIM_ElementConformsToProfile features */
const KRef ConformantStandard; /* RegisteredProfile */
- const KRef ManagedElement; /* Fan */
+ const KRef ManagedElement; /* CIM_ManagedElement */
/* Linux_FanElementConformsToProfile features */
}
ElementConformsToProfileRef;
@@ -49,7 +49,7 @@
const unsigned char* sig = __ElementConformsToProfileRef_sig;
KBase_Init(&self->__base, cb, sizeof(*self), sig, ns);
((KRef*)&self->ConformantStandard)->__sig = __RegisteredProfile_sig;
- ((KRef*)&self->ManagedElement)->__sig = __Fan_sig;
+ ((KRef*)&self->ManagedElement)->__sig = __CIM_ManagedElement_sig;
}
KINLINE CMPIStatus ElementConformsToProfileRef_InitFromInstance(
@@ -155,7 +155,7 @@
KINLINE CMPIStatus ElementConformsToProfileRef_Set_ManagedElement(
ElementConformsToProfileRef* self,
- const FanRef* x)
+ const CIM_ManagedElementRef* x)
{
if (self && self->__base.magic == KMAGIC)
{
@@ -199,7 +199,7 @@
KBase __base;
/* CIM_ElementConformsToProfile features */
const KRef ConformantStandard; /* RegisteredProfile */
- const KRef ManagedElement; /* Fan */
+ const KRef ManagedElement; /* CIM_ManagedElement */
/* Linux_FanElementConformsToProfile features */
}
ElementConformsToProfile;
@@ -221,7 +221,7 @@
const unsigned char* sig = __ElementConformsToProfile_sig;
KBase_Init(&self->__base, cb, sizeof(*self), sig, ns);
((KRef*)&self->ConformantStandard)->__sig = __RegisteredProfile_sig;
- ((KRef*)&self->ManagedElement)->__sig = __Fan_sig;
+ ((KRef*)&self->ManagedElement)->__sig = __CIM_ManagedElement_sig;
}
KINLINE CMPIStatus ElementConformsToProfile_InitFromInstance(
@@ -327,7 +327,7 @@
KINLINE CMPIStatus ElementConformsToProfile_Set_ManagedElement(
ElementConformsToProfile* self,
- const FanRef* x)
+ const CIM_ManagedElementRef* x)
{
if (self && self->__base.magic == KMAGIC)
{
Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/ElementConformsToProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/ElementConformsToProfileProvider.c 2008-08-13 18:18:45 UTC (rev 844)
+++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/ElementConformsToProfileProvider.c 2008-08-13 18:25:08 UTC (rev 845)
@@ -33,7 +33,7 @@
const CMPIObjectPath* cop,
const char** properties)
{
- const char* ns = KNameSpace(cop);
+ const char* ns = INTEROP_NAMESPACE;
RegisteredProfileRef cs;
/* Linux_FanRegisteredProfile.ConformantStandard */
Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/ReferencedProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/ReferencedProfileProvider.c 2008-08-13 18:18:45 UTC (rev 844)
+++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/ReferencedProfileProvider.c 2008-08-13 18:25:08 UTC (rev 845)
@@ -195,7 +195,7 @@
ReferencedProfileInitialize())
KONKRET_REGISTRATION(
- "root/cimv2 root/interop",
+ "root/cimv2",
"Linux_FanReferencedProfile",
"Linux_FanReferencedProfile",
"instance association");
Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/RegisteredProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/RegisteredProfileProvider.c 2008-08-13 18:18:45 UTC (rev 844)
+++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/RegisteredProfileProvider.c 2008-08-13 18:25:08 UTC (rev 845)
@@ -132,7 +132,7 @@
RegisteredProfileInitialize())
KONKRET_REGISTRATION(
- "root/cimv2 root/interop",
+ "root/cimv2",
"Linux_FanRegisteredProfile",
"Linux_FanRegisteredProfile",
"instance method");
Modified: cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/Resource.h
===================================================================
--- cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/Resource.h 2008-08-13 18:18:45 UTC (rev 844)
+++ cmpiprofiles/sblim-cmpi-fan_profile/trunk/src/Resource.h 2008-08-13 18:25:08 UTC (rev 845)
@@ -15,6 +15,7 @@
#define HIDDEN __attribute__((visibility("hidden")))
#define NAMESPACE "root/cimv2"
+#define INTEROP_NAMESPACE "root/interop"
typedef struct _Str256
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mik...@us...> - 2008-08-13 18:18:37
|
Revision: 844
http://omc.svn.sourceforge.net/omc/?rev=844&view=rev
Author: mike-brasher
Date: 2008-08-13 18:18:45 +0000 (Wed, 13 Aug 2008)
Log Message:
-----------
Regenerate registration files.
Modified Paths:
--------------
cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof/linux-boot-control-profile.reg
cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof/linux-boot-control-profile.registration
Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof/linux-boot-control-profile.reg
===================================================================
--- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof/linux-boot-control-profile.reg 2008-08-13 18:17:36 UTC (rev 843)
+++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof/linux-boot-control-profile.reg 2008-08-13 18:18:45 UTC (rev 844)
@@ -38,13 +38,13 @@
provider: Linux_BootReferencedProfile
location: linux_bootctrlprovider
type: instance association
- namespace: root/cimv2 root/interop
+ namespace: root/cimv2
#
[Linux_BootRegisteredProfile]
provider: Linux_BootRegisteredProfile
location: linux_bootctrlprovider
type: instance method
- namespace: root/cimv2 root/interop
+ namespace: root/cimv2
#
[Linux_BootServiceAffectsElement]
provider: Linux_BootServiceAffectsElement
Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof/linux-boot-control-profile.registration
===================================================================
--- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof/linux-boot-control-profile.registration 2008-08-13 18:17:36 UTC (rev 843)
+++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof/linux-boot-control-profile.registration 2008-08-13 18:18:45 UTC (rev 844)
@@ -4,7 +4,7 @@
Linux_BootElementSettingData root/cimv2 Linux_BootElementSettingData linux_bootctrlprovider instance association
Linux_BootHostedService root/cimv2 Linux_BootHostedService linux_bootctrlprovider instance association
Linux_BootOrderedComponent root/cimv2 Linux_BootOrderedComponent linux_bootctrlprovider instance association
-Linux_BootReferencedProfile root/cimv2\ root/interop Linux_BootReferencedProfile linux_bootctrlprovider instance association
-Linux_BootRegisteredProfile root/cimv2\ root/interop Linux_BootRegisteredProfile linux_bootctrlprovider instance method
+Linux_BootReferencedProfile root/cimv2 Linux_BootReferencedProfile linux_bootctrlprovider instance association
+Linux_BootRegisteredProfile root/cimv2 Linux_BootRegisteredProfile linux_bootctrlprovider instance method
Linux_BootServiceAffectsElement root/cimv2 Linux_BootServiceAffectsElement linux_bootctrlprovider instance association
Linux_GrubBootSourceSetting root/cimv2 Linux_GrubBootSourceSetting linux_bootctrlprovider instance method
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mik...@us...> - 2008-08-13 18:17:30
|
Revision: 843
http://omc.svn.sourceforge.net/omc/?rev=843&view=rev
Author: mike-brasher
Date: 2008-08-13 18:17:36 +0000 (Wed, 13 Aug 2008)
Log Message:
-----------
Reassigned instances to propert namespaces.
Modified Paths:
--------------
cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof/linux-boot-control-profile-interop.mof
cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ElementConformsToProfile.h
cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ElementConformsToProfileProvider.c
cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ReferencedProfileProvider.c
cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/RegisteredProfileProvider.c
cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/Resource.h
Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof/linux-boot-control-profile-interop.mof
===================================================================
--- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof/linux-boot-control-profile-interop.mof 2008-08-13 18:15:13 UTC (rev 842)
+++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/mof/linux-boot-control-profile-interop.mof 2008-08-13 18:17:36 UTC (rev 843)
@@ -6,7 +6,7 @@
class Linux_BootElementConformsToProfile : CIM_ElementConformsToProfile
{
[Key] Linux_BootRegisteredProfile REF ConformantStandard;
- [Key] Linux_BootService REF ManagedElement;
+ // [Key] Linux_BootService REF ManagedElement;
};
[Association]
Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ElementConformsToProfile.h
===================================================================
--- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ElementConformsToProfile.h 2008-08-13 18:15:13 UTC (rev 842)
+++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ElementConformsToProfile.h 2008-08-13 18:17:36 UTC (rev 843)
@@ -11,7 +11,7 @@
#include <konkret/konkret.h>
#include "RegisteredProfile.h"
-#include "BootService.h"
+#include "CIM_ManagedElement.h"
/*
**==============================================================================
@@ -27,7 +27,7 @@
KBase __base;
/* CIM_ElementConformsToProfile features */
const KRef ConformantStandard; /* RegisteredProfile */
- const KRef ManagedElement; /* BootService */
+ const KRef ManagedElement; /* CIM_ManagedElement */
/* Linux_BootElementConformsToProfile features */
}
ElementConformsToProfileRef;
@@ -49,7 +49,7 @@
const unsigned char* sig = __ElementConformsToProfileRef_sig;
KBase_Init(&self->__base, cb, sizeof(*self), sig, ns);
((KRef*)&self->ConformantStandard)->__sig = __RegisteredProfile_sig;
- ((KRef*)&self->ManagedElement)->__sig = __BootService_sig;
+ ((KRef*)&self->ManagedElement)->__sig = __CIM_ManagedElement_sig;
}
KINLINE CMPIStatus ElementConformsToProfileRef_InitFromInstance(
@@ -155,7 +155,7 @@
KINLINE CMPIStatus ElementConformsToProfileRef_Set_ManagedElement(
ElementConformsToProfileRef* self,
- const BootServiceRef* x)
+ const CIM_ManagedElementRef* x)
{
if (self && self->__base.magic == KMAGIC)
{
@@ -199,7 +199,7 @@
KBase __base;
/* CIM_ElementConformsToProfile features */
const KRef ConformantStandard; /* RegisteredProfile */
- const KRef ManagedElement; /* BootService */
+ const KRef ManagedElement; /* CIM_ManagedElement */
/* Linux_BootElementConformsToProfile features */
}
ElementConformsToProfile;
@@ -221,7 +221,7 @@
const unsigned char* sig = __ElementConformsToProfile_sig;
KBase_Init(&self->__base, cb, sizeof(*self), sig, ns);
((KRef*)&self->ConformantStandard)->__sig = __RegisteredProfile_sig;
- ((KRef*)&self->ManagedElement)->__sig = __BootService_sig;
+ ((KRef*)&self->ManagedElement)->__sig = __CIM_ManagedElement_sig;
}
KINLINE CMPIStatus ElementConformsToProfile_InitFromInstance(
@@ -327,7 +327,7 @@
KINLINE CMPIStatus ElementConformsToProfile_Set_ManagedElement(
ElementConformsToProfile* self,
- const BootServiceRef* x)
+ const CIM_ManagedElementRef* x)
{
if (self && self->__base.magic == KMAGIC)
{
Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ElementConformsToProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ElementConformsToProfileProvider.c 2008-08-13 18:15:13 UTC (rev 842)
+++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ElementConformsToProfileProvider.c 2008-08-13 18:17:36 UTC (rev 843)
@@ -33,7 +33,7 @@
const CMPIObjectPath* cop,
const char** properties)
{
- const char* ns = KNameSpace(cop);
+ const char* ns = INTEROP_NAMESPACE;
RegisteredProfileRef cs;
/* Linux_SSHRegisteredProfile.ConformantStandard */
Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ReferencedProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ReferencedProfileProvider.c 2008-08-13 18:15:13 UTC (rev 842)
+++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/ReferencedProfileProvider.c 2008-08-13 18:17:36 UTC (rev 843)
@@ -195,7 +195,7 @@
ReferencedProfileInitialize())
KONKRET_REGISTRATION(
- "root/cimv2 root/interop",
+ "root/cimv2",
"Linux_BootReferencedProfile",
"Linux_BootReferencedProfile",
"instance association");
Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/RegisteredProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/RegisteredProfileProvider.c 2008-08-13 18:15:13 UTC (rev 842)
+++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/RegisteredProfileProvider.c 2008-08-13 18:17:36 UTC (rev 843)
@@ -132,7 +132,7 @@
RegisteredProfileInitialize())
KONKRET_REGISTRATION(
- "root/cimv2 root/interop",
+ "root/cimv2",
"Linux_BootRegisteredProfile",
"Linux_BootRegisteredProfile",
"instance method");
Modified: cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/Resource.h
===================================================================
--- cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/Resource.h 2008-08-13 18:15:13 UTC (rev 842)
+++ cmpiprofiles/sblim-cmpi-boot_control_profile/trunk/src/Resource.h 2008-08-13 18:17:36 UTC (rev 843)
@@ -11,6 +11,7 @@
#endif
#define NAMESPACE "root/cimv2"
+#define INTEROP_NAMESPACE "root/interop"
typedef struct _Str256
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mik...@us...> - 2008-08-13 18:15:06
|
Revision: 842
http://omc.svn.sourceforge.net/omc/?rev=842&view=rev
Author: mike-brasher
Date: 2008-08-13 18:15:13 +0000 (Wed, 13 Aug 2008)
Log Message:
-----------
Fixed wrong namespace in ElementConformsToProfile instance.
Modified Paths:
--------------
cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementConformsToProfileProvider.c
cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/common.h
Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementConformsToProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementConformsToProfileProvider.c 2008-08-13 18:09:20 UTC (rev 841)
+++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementConformsToProfileProvider.c 2008-08-13 18:15:13 UTC (rev 842)
@@ -34,7 +34,7 @@
const CMPIObjectPath* cop,
const char** properties)
{
- const char* ns = KNameSpace(cop);
+ const char* ns = INTEROP_NAMESPACE;
RegisteredProfileRef cs;
/* Linux_RegisteredProfileEthernetPort.ConformantStandard */
Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/common.h
===================================================================
--- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/common.h 2008-08-13 18:09:20 UTC (rev 841)
+++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/common.h 2008-08-13 18:15:13 UTC (rev 842)
@@ -8,6 +8,7 @@
#define HIDDEN __attribute__((visibility("hidden")))
#define NAMESPACE "root/cimv2"
+#define INTEROP_NAMESPACE "root/interop"
HIDDEN extern size_t strlcpy(char* dest, const char* src, size_t size);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mik...@us...> - 2008-08-13 18:09:12
|
Revision: 841
http://omc.svn.sourceforge.net/omc/?rev=841&view=rev
Author: mike-brasher
Date: 2008-08-13 18:09:20 +0000 (Wed, 13 Aug 2008)
Log Message:
-----------
Regenerated registration files.
Modified Paths:
--------------
cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile.reg
cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile.registration
Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile.reg
===================================================================
--- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile.reg 2008-08-13 18:07:13 UTC (rev 840)
+++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile.reg 2008-08-13 18:09:20 UTC (rev 841)
@@ -56,13 +56,13 @@
provider: Linux_ReferencedProfileEthernetPort
location: linux_ethportprovider
type: instance association
- namespace: root/cimv2 root/interop
+ namespace: root/interop
#
[Linux_RegisteredProfileEthernetPort]
provider: Linux_RegisteredProfileEthernetPort
location: linux_ethportprovider
type: instance method
- namespace: root/cimv2 root/interop
+ namespace: root/interop
#
[Linux_SystemDeviceEthernetPort]
provider: Linux_SystemDeviceEthernetPort
Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile.registration
===================================================================
--- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile.registration 2008-08-13 18:07:13 UTC (rev 840)
+++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile.registration 2008-08-13 18:09:20 UTC (rev 841)
@@ -7,6 +7,6 @@
Linux_EthernetPort root/cimv2 Linux_EthernetPort linux_ethportprovider instance method
Linux_HostedAccessPointEthernetPort root/cimv2 Linux_HostedAccessPointEthernetPort linux_ethportprovider instance association
Linux_LANEndpoint root/cimv2 Linux_LANEndpoint linux_ethportprovider instance method
-Linux_ReferencedProfileEthernetPort root/cimv2\ root/interop Linux_ReferencedProfileEthernetPort linux_ethportprovider instance association
-Linux_RegisteredProfileEthernetPort root/cimv2\ root/interop Linux_RegisteredProfileEthernetPort linux_ethportprovider instance method
+Linux_ReferencedProfileEthernetPort root/interop Linux_ReferencedProfileEthernetPort linux_ethportprovider instance association
+Linux_RegisteredProfileEthernetPort root/interop Linux_RegisteredProfileEthernetPort linux_ethportprovider instance method
Linux_SystemDeviceEthernetPort root/cimv2 Linux_SystemDeviceEthernetPort linux_ethportprovider instance association
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mik...@us...> - 2008-08-13 18:07:07
|
Revision: 840
http://omc.svn.sourceforge.net/omc/?rev=840&view=rev
Author: mike-brasher
Date: 2008-08-13 18:07:13 +0000 (Wed, 13 Aug 2008)
Log Message:
-----------
Rework to get ReferencedProfile and RegisteredProfile instances out of
the root/cimv2 namespace.
Modified Paths:
--------------
cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile-interop.mof
cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementConformsToProfile.h
cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ReferencedProfileProvider.c
cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/RegisteredProfileProvider.c
Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile-interop.mof
===================================================================
--- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile-interop.mof 2008-08-12 23:57:29 UTC (rev 839)
+++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/mof/linux-ethernet-port-profile-interop.mof 2008-08-13 18:07:13 UTC (rev 840)
@@ -6,7 +6,7 @@
class Linux_ElementConformsToProfileEthernetPort : CIM_ElementConformsToProfile
{
[Key] Linux_RegisteredProfileEthernetPort REF ConformantStandard;
- [Key] Linux_EthernetPort REF ManagedElement;
+ // [Key] Linux_EthernetPort REF ManagedElement;
};
[Association]
Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementConformsToProfile.h
===================================================================
--- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementConformsToProfile.h 2008-08-12 23:57:29 UTC (rev 839)
+++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ElementConformsToProfile.h 2008-08-13 18:07:13 UTC (rev 840)
@@ -11,7 +11,7 @@
#include <konkret/konkret.h>
#include "RegisteredProfile.h"
-#include "EthernetPort.h"
+#include "CIM_ManagedElement.h"
/*
**==============================================================================
@@ -27,7 +27,7 @@
KBase __base;
/* CIM_ElementConformsToProfile features */
const KRef ConformantStandard; /* RegisteredProfile */
- const KRef ManagedElement; /* EthernetPort */
+ const KRef ManagedElement; /* CIM_ManagedElement */
/* Linux_ElementConformsToProfileEthernetPort features */
}
ElementConformsToProfileRef;
@@ -50,7 +50,7 @@
const unsigned char* sig = __ElementConformsToProfileRef_sig;
KBase_Init(&self->__base, cb, sizeof(*self), sig, ns);
((KRef*)&self->ConformantStandard)->__sig = __RegisteredProfile_sig;
- ((KRef*)&self->ManagedElement)->__sig = __EthernetPort_sig;
+ ((KRef*)&self->ManagedElement)->__sig = __CIM_ManagedElement_sig;
}
KINLINE CMPIStatus ElementConformsToProfileRef_InitFromInstance(
@@ -156,7 +156,7 @@
KINLINE CMPIStatus ElementConformsToProfileRef_Set_ManagedElement(
ElementConformsToProfileRef* self,
- const EthernetPortRef* x)
+ const CIM_ManagedElementRef* x)
{
if (self && self->__base.magic == KMAGIC)
{
@@ -200,7 +200,7 @@
KBase __base;
/* CIM_ElementConformsToProfile features */
const KRef ConformantStandard; /* RegisteredProfile */
- const KRef ManagedElement; /* EthernetPort */
+ const KRef ManagedElement; /* CIM_ManagedElement */
/* Linux_ElementConformsToProfileEthernetPort features */
}
ElementConformsToProfile;
@@ -223,7 +223,7 @@
const unsigned char* sig = __ElementConformsToProfile_sig;
KBase_Init(&self->__base, cb, sizeof(*self), sig, ns);
((KRef*)&self->ConformantStandard)->__sig = __RegisteredProfile_sig;
- ((KRef*)&self->ManagedElement)->__sig = __EthernetPort_sig;
+ ((KRef*)&self->ManagedElement)->__sig = __CIM_ManagedElement_sig;
}
KINLINE CMPIStatus ElementConformsToProfile_InitFromInstance(
@@ -329,7 +329,7 @@
KINLINE CMPIStatus ElementConformsToProfile_Set_ManagedElement(
ElementConformsToProfile* self,
- const EthernetPortRef* x)
+ const CIM_ManagedElementRef* x)
{
if (self && self->__base.magic == KMAGIC)
{
Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ReferencedProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ReferencedProfileProvider.c 2008-08-12 23:57:29 UTC (rev 839)
+++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/ReferencedProfileProvider.c 2008-08-13 18:07:13 UTC (rev 840)
@@ -196,7 +196,7 @@
ReferencedProfileInitialize())
KONKRET_REGISTRATION(
- "root/cimv2 root/interop",
+ "root/interop",
"Linux_ReferencedProfileEthernetPort",
"Linux_ReferencedProfileEthernetPort",
"instance association")
Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/RegisteredProfileProvider.c
===================================================================
--- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/RegisteredProfileProvider.c 2008-08-12 23:57:29 UTC (rev 839)
+++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/RegisteredProfileProvider.c 2008-08-13 18:07:13 UTC (rev 840)
@@ -132,7 +132,7 @@
RegisteredProfileInitialize())
KONKRET_REGISTRATION(
- "root/cimv2 root/interop",
+ "root/interop",
"Linux_RegisteredProfileEthernetPort",
"Linux_RegisteredProfileEthernetPort",
"instance method")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mik...@us...> - 2008-08-12 23:57:19
|
Revision: 839
http://omc.svn.sourceforge.net/omc/?rev=839&view=rev
Author: mike-brasher
Date: 2008-08-12 23:57:29 +0000 (Tue, 12 Aug 2008)
Log Message:
-----------
Added handling of optional namespace column in ProviderList.txt
Modified Paths:
--------------
cmpiprofiles/test/trunk/AllSanityTest.py
cmpiprofiles/test/trunk/ProviderList.txt
Modified: cmpiprofiles/test/trunk/AllSanityTest.py
===================================================================
--- cmpiprofiles/test/trunk/AllSanityTest.py 2008-08-12 22:38:41 UTC (rev 838)
+++ cmpiprofiles/test/trunk/AllSanityTest.py 2008-08-12 23:57:29 UTC (rev 839)
@@ -17,6 +17,7 @@
globalVerbose = False
+globalNamespace = 'root/cimv2'
globalClass = None
globalParser = None
globalListFile = 'ProviderList.txt'
@@ -31,11 +32,15 @@
def tearDown(self):
unittest.TestCase.tearDown(self)
- def _test_provider(self, className):
+ def _test_provider(self, className, namespace):
type = 'I'
isAssoc=False
cls=None
- print ">>>> Now Testing Class: [%s] " %(className)
+ if len(namespace) > 0:
+ self.conn.default_namespace = namespace
+ else:
+ self.conn.default_namespace = globalNamespace
+ print ">>>> Now Testing Class: [%s:%s] " %(self.conn.default_namespace, className)
try:
cls=self.conn.GetClass(className,LocalOnly=False)
except pywbem.CIMError, (num, msg):
@@ -88,9 +93,12 @@
columns = line.split()
if len(columns) > 0:
className=columns[0]
- className.split()
+ if len(columns) > 1:
+ namespace = columns[1]
+ else:
+ namespace = ''
try:
- self._test_provider(className)
+ self._test_provider(className, namespace)
except:
print '-'*60
traceback.print_exc(file=sys.stdout)
@@ -140,9 +148,10 @@
if '--cimclass=%s'%globalClass in sys.argv:
sys.argv.remove('--cimclass=%s'%globalClass)
'''
+ if options.namespace != None:
+ globalNamespace = options.namespace
globalParser=p
-
suite = unittest.makeSuite(AllProviderSanityTest)
unittest.TextTestRunner(verbosity=2).run(suite)
Modified: cmpiprofiles/test/trunk/ProviderList.txt
===================================================================
--- cmpiprofiles/test/trunk/ProviderList.txt 2008-08-12 22:38:41 UTC (rev 838)
+++ cmpiprofiles/test/trunk/ProviderList.txt 2008-08-12 23:57:29 UTC (rev 839)
@@ -3,11 +3,14 @@
Linux_BootService
Linux_BootConfigSetting
Linux_BootElementConformsToProfile
+Linux_BootElementConformsToProfile root/interop
Linux_BootElementSettingData
Linux_BootHostedService
Linux_BootOrderedComponent
Linux_BootReferencedProfile
+Linux_BootReferencedProfile root/interop
Linux_BootRegisteredProfile
+Linux_BootRegisteredProfile root/interop
Linux_BootServiceAffectsElement
Linux_GrubBootSourceSetting
@@ -15,16 +18,20 @@
Linux_ElementCapabilitiesLANEndpoint
Linux_ElementCapabilitiesEthernetPort
Linux_ElementConformsToProfileEthernetPort
+Linux_ElementConformsToProfileEthernetPort root/interop
Linux_EnabledLogicalElementCapabilitiesLANEndpoint
Linux_EnabledLogicalElementCapabilitiesEthernetPort
Linux_EthernetPort
Linux_HostedAccessPointEthernetPort
Linux_LANEndpoint
Linux_ReferencedProfileEthernetPort
+Linux_ReferencedProfileEthernetPort root/interop
Linux_RegisteredProfileEthernetPort
+Linux_RegisteredProfileEthernetPort root/interop
Linux_SystemDeviceEthernetPort
Linux_FanElementConformsToProfile
+Linux_FanElementConformsToProfile root/interop
Linux_Fan
Linux_FanHostedCollection
Linux_FanIsSpare
@@ -32,10 +39,13 @@
Linux_FanOwningCollectionElement
Linux_FanRedundancySet
Linux_FanReferencedProfile
+Linux_FanReferencedProfile root/interop
Linux_FanRegisteredProfile
+Linux_FanRegisteredProfile root/interop
Linux_FanSystemDevice
Linux_PowerElementConformsToProfile
+Linux_PowerElementConformsToProfile root/interop
Linux_PowerHostedCollection
Linux_PowerIsSpare
Linux_PowerMemberOfCollection
@@ -43,17 +53,22 @@
Linux_PowerSupply
Linux_PowerRedundancySet
Linux_PowerReferencedProfile
+Linux_PowerReferencedProfile root/interop
Linux_PowerRegisteredProfile
+Linux_PowerRegisteredProfile root/interop
Linux_PowerSystemDevice
Linux_SSHCapabilities
Linux_SSHElementCapabilities
Linux_SSHElementConformsToProfile
+Linux_SSHElementConformsToProfile root/interop
Linux_SSHHostedAccessPoint
Linux_SSHHostedService
Linux_SSHProtocolEndpoint
Linux_SSHProtocolService
Linux_SSHProvidesEndpoint
Linux_SSHReferencedProfile
+Linux_SSHReferencedProfile root/interop
Linux_SSHRegisteredProfile
+Linux_SSHRegisteredProfile root/interop
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ba...@us...> - 2008-08-12 22:38:31
|
Revision: 838
http://omc.svn.sourceforge.net/omc/?rev=838&view=rev
Author: bartw
Date: 2008-08-12 22:38:41 +0000 (Tue, 12 Aug 2008)
Log Message:
-----------
fix up wbem_connection
Modified Paths:
--------------
cmpiprofiles/test/trunk/AllSanityTest.py
cmpiprofiles/test/trunk/lib/wbem_connection.py
Modified: cmpiprofiles/test/trunk/AllSanityTest.py
===================================================================
--- cmpiprofiles/test/trunk/AllSanityTest.py 2008-08-12 20:39:14 UTC (rev 837)
+++ cmpiprofiles/test/trunk/AllSanityTest.py 2008-08-12 22:38:41 UTC (rev 838)
@@ -25,8 +25,7 @@
def setUp(self):
self.instance = None
- wconn = wbem_connection.wbem_connection()
- self.conn = wconn._WBEMConnFromOptions(p)
+ self.conn = wbem_connection.WBEMConnFromOptions(p)
unittest.TestCase.setUp(self)
def tearDown(self):
Modified: cmpiprofiles/test/trunk/lib/wbem_connection.py
===================================================================
--- cmpiprofiles/test/trunk/lib/wbem_connection.py 2008-08-12 20:39:14 UTC (rev 837)
+++ cmpiprofiles/test/trunk/lib/wbem_connection.py 2008-08-12 22:38:41 UTC (rev 838)
@@ -1,50 +1,29 @@
#!/usr/bin/env python
import pywbem
from optparse import OptionParser
+from getpass import getpass
def getWBEMConnParserOptions(parser):
- parser.add_option('', '--host', default='localhost', help='Specify the hosting machine of the CIMOM')
- parser.add_option('-s', '--secure', action='store_true', default=False, help='Use the HTTPS protocol. Default is HTTP')
+ parser.add_option('-u', '--url', default='https://localhost', help='Specify the URL to the CIMOM')
parser.add_option('-n', '--namespace', default='root/cimv2', help='Specify the namespace the test runs against')
- parser.add_option('', '--user', default='anonymous', help='Specify the user name used when connection to the CIMOM')
- parser.add_option('', '--password', default='nothing', help='Specify the password for the user')
+ parser.add_option('', '--user', default='', help='Specify the user name used when connection to the CIMOM')
+ parser.add_option('', '--password', default='', help='Specify the password for the user')
-class wbem_connection:
- conn = ''
- namesapce = ''
- def __init__(self):
- self.uname = 'pegasus'
- self.passwd = 'novell'
-
- #def get_wbem_connection(url=none):
- def get_wbem_connection(self):
- """Return a wbem connection to ZOS_SERVER"""
- conn = pywbem.WBEMConnection('https://localhost', ('root', 'novell'))
-#conn.default_namespace = 'root/ZENworks'
- return conn
- def get_default_namespace(self):
- return self.namespace
+def WBEMConnFromOptions(parser=None):
+ if parser==None:
+ parser = OptionParser()
+ getWBEMConnParserOptions(parser)
+ options, args = parser.parse_args()
+ pw = options.password
+ if options.user and not pw:
+ pw = getpass('\nEnter password for %s: ' % options.user)
+ wconn = pywbem.WBEMConnection(options.url, (options.user, pw))
+ if options.namespace:
+ wconn.default_namespace = options.namespace
+ return wconn
- def set_default_namespace(self, namespace):
- self.namespace = namespace
- conn.default_namespace = self.namespace
- def _WBEMConnFromOptions(self,parser=None):
- if parser==None:
- parser = OptionParser()
- getWBEMConnParserOptions(parser)
- options, args = parser.parse_args()
- proto = options.secure and 'https' or 'http'
- url = '%s://%s' % (proto, options.host)
- #wconn = pywbem.WBEMConnection(url, (options.user, options.password),
- # default_namespace=options.namespace)
- wconn = pywbem.WBEMConnection('https://localhost', ('root', 'taunya'))
-#wconn.default_namespace="root/ZENworks"
- return wconn
-
-
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mik...@us...> - 2008-08-12 20:39:05
|
Revision: 837
http://omc.svn.sourceforge.net/omc/?rev=837&view=rev
Author: mike-brasher
Date: 2008-08-12 20:39:14 +0000 (Tue, 12 Aug 2008)
Log Message:
-----------
Removed unused file.
Removed Paths:
-------------
cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/yes
Deleted: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/yes
===================================================================
--- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/yes 2008-08-12 20:31:48 UTC (rev 836)
+++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/yes 2008-08-12 20:39:14 UTC (rev 837)
@@ -1 +0,0 @@
-yes
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mik...@us...> - 2008-08-12 20:31:38
|
Revision: 836
http://omc.svn.sourceforge.net/omc/?rev=836&view=rev
Author: mike-brasher
Date: 2008-08-12 20:31:48 +0000 (Tue, 12 Aug 2008)
Log Message:
-----------
Skipping all-zero mac addresses in resource discovery. This skips
loopback interfaces but not virtual ethernet ports.
Modified Paths:
--------------
cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/Resource.c
Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/Resource.c
===================================================================
--- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/Resource.c 2008-08-12 19:34:16 UTC (rev 835)
+++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/Resource.c 2008-08-12 20:31:48 UTC (rev 836)
@@ -158,6 +158,8 @@
strlcpy(info->name, p->ifa_name, sizeof(info->name));
+ /* Get family */
+
if (family == AF_INET6)
{
inet_ntop(
@@ -266,6 +268,13 @@
if (_find(head, ifr->ifr_name))
continue;
+ /* Skip the loopback interface */
+
+#if 0
+ if (strcmp(ifr->ifr_name, "lo") == 0)
+ continue;
+#endif
+
/* Clear info structure */
memset(&info, 0, sizeof(info));
@@ -319,6 +328,11 @@
mac[1], mac[2], mac[3], mac[4], mac[5]);
}
+ /* Skip all-zero mac addresses */
+
+ if (strcmp(info.mac, "000000000000") == 0)
+ continue;
+
/* Get the flags */
{
struct ifreq tmp;
@@ -430,17 +444,14 @@
/* Get additional information using the ethtool program */
- if (_ethtool(&eti, info.name) == -1)
+ if (_ethtool(&eti, info.name) == 0)
{
- /* Skip this interface (it's not an ethernet interface) */
- continue;
+ info.speed_mbps = eti.speed_mbps;
+ info.full_duplex = eti.full_duplex;
+ info.supports_wake_on = eti.supports_wake_on;
+ info.wake_on = eti.wake_on;
}
- info.speed_mbps = eti.speed_mbps;
- info.full_duplex = eti.full_duplex;
- info.supports_wake_on = eti.supports_wake_on;
- info.wake_on = eti.wake_on;
-
/* Create new node and insert at end of list */
node = (struct EthernetPortResource*)malloc(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mik...@us...> - 2008-08-12 19:34:06
|
Revision: 835
http://omc.svn.sourceforge.net/omc/?rev=835&view=rev
Author: mike-brasher
Date: 2008-08-12 19:34:16 +0000 (Tue, 12 Aug 2008)
Log Message:
-----------
Added logic to exclude non-ethernet interfaces.
Modified Paths:
--------------
cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/Resource.c
cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/lsif.mak
Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/Resource.c
===================================================================
--- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/Resource.c 2008-08-11 22:04:18 UTC (rev 834)
+++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/Resource.c 2008-08-12 19:34:16 UTC (rev 835)
@@ -15,8 +15,6 @@
#define MAX_IFREQ 64
-#define ETHERNET_INTERFACES_ONLY
-
struct EthtoolInfo
{
/* Non-zero if full duplex */
@@ -38,6 +36,7 @@
char buf[64];
char line[128];
FILE* os;
+ int matches = 0;
/* Clear info structure */
@@ -81,27 +80,31 @@
{
if (strncmp(p + 8, "Full", 4) == 0)
info->full_duplex = 1;
+ matches++;
}
else if (strncmp(p, "Speed: ", 7) == 0)
{
info->speed_mbps = atoi(p + 7);
+ matches++;
}
else if (strncmp(p, "Supports Wake-on: ", 18) == 0)
{
if (strchr(p + 9, 'p') || strchr(p + 9, 'g'))
info->supports_wake_on = 1;
+ matches++;
}
else if (strncmp(p, "Wake-on: ", 9) == 0)
{
if (strchr(p + 9, 'p') || strchr(p + 9, 'g'))
info->wake_on = 1;
+ matches++;
}
}
/* Close stream */
pclose(os);
- return 0;
+ return matches ? 0 : -1;
}
static struct EthernetPortResource* _find(
@@ -284,13 +287,6 @@
addr_len = sizeof(struct sockaddr);
}
- /* Skip non-ethernet ports */
-
-#if defined(ETHERNET_INTERFACES_ONLY)
- if (strncmp(ifr->ifr_name, "eth", 3) != 0)
- continue;
-#endif
-
/* Skip unknown address families */
if (family != AF_INET && family != AF_INET6)
@@ -434,14 +430,17 @@
/* Get additional information using the ethtool program */
- if (_ethtool(&eti, info.name) == 0)
+ if (_ethtool(&eti, info.name) == -1)
{
- info.speed_mbps = eti.speed_mbps;
- info.full_duplex = eti.full_duplex;
- info.supports_wake_on = eti.supports_wake_on;
- info.wake_on = eti.wake_on;
+ /* Skip this interface (it's not an ethernet interface) */
+ continue;
}
+ info.speed_mbps = eti.speed_mbps;
+ info.full_duplex = eti.full_duplex;
+ info.supports_wake_on = eti.supports_wake_on;
+ info.wake_on = eti.wake_on;
+
/* Create new node and insert at end of list */
node = (struct EthernetPortResource*)malloc(
Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/lsif.mak
===================================================================
--- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/lsif.mak 2008-08-11 22:04:18 UTC (rev 834)
+++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/lsif.mak 2008-08-12 19:34:16 UTC (rev 835)
@@ -1,2 +1,2 @@
all:
- gcc -o lsif -DLSIF Resource.c common.c
+ gcc -I/usr/include/cmpi -o lsif -DLSIF Resource.c common.c
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mik...@us...> - 2008-08-11 22:04:19
|
Revision: 834
http://omc.svn.sourceforge.net/omc/?rev=834&view=rev
Author: mike-brasher
Date: 2008-08-11 22:04:18 +0000 (Mon, 11 Aug 2008)
Log Message:
-----------
Set ethernet-port providers to only show true ethernet ports.
Modified Paths:
--------------
cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/Resource.c
Modified: cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/Resource.c
===================================================================
--- cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/Resource.c 2008-08-08 21:22:12 UTC (rev 833)
+++ cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk/src/Resource.c 2008-08-11 22:04:18 UTC (rev 834)
@@ -15,6 +15,8 @@
#define MAX_IFREQ 64
+#define ETHERNET_INTERFACES_ONLY
+
struct EthtoolInfo
{
/* Non-zero if full duplex */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mik...@us...> - 2008-08-08 21:22:03
|
Revision: 833
http://omc.svn.sourceforge.net/omc/?rev=833&view=rev
Author: mike-brasher
Date: 2008-08-08 21:22:12 +0000 (Fri, 08 Aug 2008)
Log Message:
-----------
konkretreg now using -r option.
Modified Paths:
--------------
cmpiprofiles/test/trunk/GenProviderList.sh
Modified: cmpiprofiles/test/trunk/GenProviderList.sh
===================================================================
--- cmpiprofiles/test/trunk/GenProviderList.sh 2008-08-08 21:15:12 UTC (rev 832)
+++ cmpiprofiles/test/trunk/GenProviderList.sh 2008-08-08 21:22:12 UTC (rev 833)
@@ -15,6 +15,6 @@
for i in $libs
do
- konkretreg $i | sed 's/[ \t].*//g' >> $fn
+ konkretreg -r $i | sed 's/[ \t].*//g' >> $fn
echo "" >> $fn
done
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
