[Omc-commit] SF.net SVN: omc:[840] cmpiprofiles/sblim-cmpi-ethernet_port_profile/trunk

[<mik...@us...>]

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.