Menu
▾
▴
[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-421-gfe37e23
|
From: Michael Chase-S. <mc...@us...> - 2013-04-10 22:07:12
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sfcb - Small Footprint CIM Broker".
The branch, master has been updated
via fe37e23d6602dbbdf735b06c3f3a6c3a1bf8e2e7 (commit)
from 24f0cd959bf6d1cc8227de1f5a613fd157eb5183 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit fe37e23d6602dbbdf735b06c3f3a6c3a1bf8e2e7
Author: Michael Chase-Salerno <br...@li...>
Date: Wed Apr 10 18:06:17 2013 -0400
[sfcb-tix:#36] Add Pulled Enums test provider
-----------------------------------------------------------------------
Summary of changes:
sfcbmacs.h | 15 ++
test/TestProviders/Makefile.am | 4 +
.../TestProviders/cmpiTestPulledInstanceProvider.c | 117 +++++++++++
test/TestProviders/tests/PECheckProv01_EnumInst.OK | 203 ++++++++++++++++++++
.../{RIEnumIS.XML => PECheckProv01_EnumInst.xml} | 4 +-
.../tests/PECheckProv02_EnumInstNames.OK | 91 +++++++++
...ceNames.xml => PECheckProv02_EnumInstNames.xml} | 2 +-
.../tests/PECheckProv03_SetCount.OK} | 6 +-
.../TestProviders/tests/PECheckProv03_SetCount.xml | 4 +
test/TestProviders/tests/PECheckProv04_EnumInst.OK | 23 +++
.../{RIEnumIS.XML => PECheckProv04_EnumInst.xml} | 4 +-
.../tests/PECheckProv05_EnumInstNames.OK} | 11 +-
...ceNames.xml => PECheckProv05_EnumInstNames.xml} | 2 +-
test/schema/root/cimv2/Test_PulledInstance.mof | 8 +
test/schema/root/cimv2/Test_PulledInstance.reg | 6 +
15 files changed, 485 insertions(+), 15 deletions(-)
diff --git a/sfcbmacs.h b/sfcbmacs.h
index 47ea1e8..c583c6b 100644
--- a/sfcbmacs.h
+++ b/sfcbmacs.h
@@ -26,6 +26,21 @@ static CMPIStatus __attribute__ ((unused)) okSt = { CMPI_RC_OK, NULL };
const CMPIResult __attribute__ ((unused)) *rslt, \
const CMPIObjectPath __attribute__ ((unused)) * cop) { return notSupSt; }
+#define notSupCMPI_GI(pfx) \
+ pfx##GetInstance(CMPIInstanceMI __attribute__ ((unused)) *mi, \
+ const CMPIContext __attribute__ ((unused)) *ctx, \
+ const CMPIResult __attribute__ ((unused)) *rslt, \
+ const CMPIObjectPath __attribute__ ((unused)) * cop, \
+ const char __attribute__ ((unused)) **properties) { return notSupSt; }
+
+#define notSupCMPI_MI(pfx) \
+ pfx##ModifyInstance(CMPIInstanceMI __attribute__ ((unused)) *mi, \
+ const CMPIContext __attribute__ ((unused)) *ctx, \
+ const CMPIResult __attribute__ ((unused)) *rslt, \
+ const CMPIObjectPath __attribute__ ((unused)) * cop, \
+ const CMPIInstance __attribute__ ((unused)) *ci, \
+ const char __attribute__ ((unused)) **properties) { return notSupSt; }
+
#define notSupCMPI_SP(pfx) \
pfx##SetProperty(CMPIPropertyMI __attribute__ ((unused)) *mi, \
const CMPIContext __attribute__ ((unused)) *ctx, \
diff --git a/test/TestProviders/Makefile.am b/test/TestProviders/Makefile.am
index 6c9054e..540d3e8 100644
--- a/test/TestProviders/Makefile.am
+++ b/test/TestProviders/Makefile.am
@@ -31,6 +31,7 @@ sfcbprovtest_LTLIBRARIES = \
libTestAssociationProvider.la \
libTestMethodProvider.la \
libTestInstanceProvider.la \
+ libTestPulledInstanceProvider.la \
libTestMiscProvider.la \
libTestExecQueryProvider.la \
libTestIndicationProvider.la
@@ -44,6 +45,9 @@ libTestMethodProvider_la_LIBADD = -lsfcBrokerCore
libTestInstanceProvider_la_SOURCES = cmpiTestInstanceProvider.c
libTestInstanceProvider_la_LIBADD = -lsfcBrokerCore
+libTestPulledInstanceProvider_la_SOURCES = cmpiTestPulledInstanceProvider.c
+libTestPulledInstanceProvider_la_LIBADD = -lsfcBrokerCore
+
libTestMiscProvider_la_SOURCES = cmpiTestMiscProvider.c
libTestMiscProvider_la_LIBADD = -lsfcBrokerCore
diff --git a/test/TestProviders/cmpiTestPulledInstanceProvider.c b/test/TestProviders/cmpiTestPulledInstanceProvider.c
new file mode 100644
index 0000000..3c4ba56
--- /dev/null
+++ b/test/TestProviders/cmpiTestPulledInstanceProvider.c
@@ -0,0 +1,117 @@
+/*
+This provider will enumerate an arbitrary number of instances
+or instance names. The number of instances returned is determined
+by the value of the instCount variable. The value of instCount
+can be set via the setCount method call which takes a uint32
+parameter, InstanceCount. For example:
+
+wbemcli cm http://localhost:5988/root/cimv2:TEST_PulledInstance setCount.InstanceCount=86
+
+*/
+#include "cmpi/cmpidt.h"
+#include "cmpi/cmpift.h"
+#include "cmpi/cmpimacs.h"
+#include <string.h>
+#include <sys/time.h>
+#include "sfcbmacs.h"
+
+#define _ClassName "TEST_PulledInstance"
+static const CMPIBroker *_broker;
+
+// This holds the number of instances to return
+static unsigned int instCount=16;
+
+CMPIStatus
+TestPulledInstanceProviderEnumInstanceNames(CMPIInstanceMI * mi,
+ const CMPIContext *ctx,
+ const CMPIResult *rslt,
+ const CMPIObjectPath * ref)
+{
+ CMPIStatus rc = { CMPI_RC_OK, NULL };
+ CMPIObjectPath *lop=CMNewObjectPath(_broker,"root/cimv2","TEST_PulledInstance",NULL);
+ unsigned int j = 0;
+ CMPIValue jv;
+
+ for (j = 1; j <= instCount; j++) {
+ jv.uint32=j;
+ CMAddKey(lop,"Identifier",&jv,CMPI_uint32);
+ CMReturnObjectPath(rslt, lop);
+ }
+ CMReturnDone(rslt);
+ CMReturn(CMPI_RC_OK);
+}
+
+CMPIStatus
+TestPulledInstanceProviderEnumInstances(CMPIInstanceMI * mi,
+ const CMPIContext *ctx,
+ const CMPIResult *rslt,
+ const CMPIObjectPath * op,
+ const char **properties)
+{
+ CMPIStatus rc = { CMPI_RC_OK, NULL };
+ unsigned int j = 0;
+ CMPIData data;
+ CMPIObjectPath *lop=CMNewObjectPath(_broker,"root/cimv2","TEST_PulledInstance",NULL);
+ CMPIInstance *ci;
+ CMPIValue jv;
+
+ for (j = 1; j <= instCount; j++) {
+ jv.uint32=j;
+ CMAddKey(lop,"Identifier",&jv,CMPI_uint32);
+ ci=CMNewInstance(_broker,lop,NULL);
+ CMSetProperty(ci,"Identifier",&jv,CMPI_uint32);
+ CMReturnInstance(rslt, ci);
+ }
+ CMReturnDone(rslt);
+ CMReturn(CMPI_RC_OK);
+}
+
+CMPIStatus
+TestPulledInstanceProviderInvokeMethod(CMPIMethodMI * mi,
+ const CMPIContext *ctx,
+ const CMPIResult *rslt,
+ const CMPIObjectPath * ref,
+ const char *methodName,
+ const CMPIArgs * in, CMPIArgs * out)
+{
+
+ if (strcasecmp(methodName, "setCount") == 0) {
+ instCount=in->ft->getArg(in, "InstanceCount", NULL).value.uint32;
+ } else {
+ CMReturn(CMPI_RC_ERR_METHOD_NOT_FOUND);
+ }
+ CMReturn(CMPI_RC_OK);
+}
+
+static CMPIStatus okCleanup(TestPulledInstanceProvider,Method);
+
+CMPIStatus
+TestPulledInstanceProviderCleanup(CMPIInstanceMI * mi,
+ const CMPIContext *ctx, CMPIBoolean terminate)
+{
+ CMReturn(CMPI_RC_OK);
+}
+
+/*
+ * Stubs
+*/
+static CMPIStatus notSupCMPI_EQ(TestPulledInstanceProvider);
+static CMPIStatus notSupCMPI_CI(TestPulledInstanceProvider);
+static CMPIStatus notSupCMPI_DI(TestPulledInstanceProvider);
+static CMPIStatus notSupCMPI_MI(TestPulledInstanceProvider);
+static CMPIStatus notSupCMPI_GI(TestPulledInstanceProvider);
+
+/*
+ * ---------------------------------------------------------------------------
+ * Provider Factory
+ * ---------------------------------------------------------------------------
+ */
+
+CMInstanceMIStub(TestPulledInstanceProvider, TestPulledInstanceProvider, _broker, CMNoHook)
+CMMethodMIStub(TestPulledInstanceProvider, TestPulledInstanceProvider, _broker, CMNoHook);
+
+/* MODELINES */
+/* DO NOT EDIT BELOW THIS COMMENT */
+/* Modelines are added by 'make pretty' */
+/* -*- Mode: C; c-basic-offset: 2; indent-tabs-mode: nil; -*- */
+/* vi:set ts=2 sts=2 sw=2 expandtab: */
diff --git a/test/TestProviders/tests/PECheckProv01_EnumInst.OK b/test/TestProviders/tests/PECheckProv01_EnumInst.OK
new file mode 100644
index 0000000..97fb352
--- /dev/null
+++ b/test/TestProviders/tests/PECheckProv01_EnumInst.OK
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<CIM CIMVERSION="2.0" DTDVERSION="2.0">
+<MESSAGE ID="4711" PROTOCOLVERSION="1.0">
+<SIMPLERSP>
+<IMETHODRESPONSE NAME="EnumerateInstances">
+<IRETURNVALUE>
+<VALUE.NAMEDINSTANCE>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">1</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCE CLASSNAME="TEST_PulledInstance">
+<PROPERTY NAME="Identifier" TYPE="uint32">
+<VALUE>1</VALUE>
+</PROPERTY>
+</INSTANCE>
+</VALUE.NAMEDINSTANCE>
+<VALUE.NAMEDINSTANCE>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">2</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCE CLASSNAME="TEST_PulledInstance">
+<PROPERTY NAME="Identifier" TYPE="uint32">
+<VALUE>2</VALUE>
+</PROPERTY>
+</INSTANCE>
+</VALUE.NAMEDINSTANCE>
+<VALUE.NAMEDINSTANCE>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">3</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCE CLASSNAME="TEST_PulledInstance">
+<PROPERTY NAME="Identifier" TYPE="uint32">
+<VALUE>3</VALUE>
+</PROPERTY>
+</INSTANCE>
+</VALUE.NAMEDINSTANCE>
+<VALUE.NAMEDINSTANCE>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">4</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCE CLASSNAME="TEST_PulledInstance">
+<PROPERTY NAME="Identifier" TYPE="uint32">
+<VALUE>4</VALUE>
+</PROPERTY>
+</INSTANCE>
+</VALUE.NAMEDINSTANCE>
+<VALUE.NAMEDINSTANCE>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">5</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCE CLASSNAME="TEST_PulledInstance">
+<PROPERTY NAME="Identifier" TYPE="uint32">
+<VALUE>5</VALUE>
+</PROPERTY>
+</INSTANCE>
+</VALUE.NAMEDINSTANCE>
+<VALUE.NAMEDINSTANCE>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">6</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCE CLASSNAME="TEST_PulledInstance">
+<PROPERTY NAME="Identifier" TYPE="uint32">
+<VALUE>6</VALUE>
+</PROPERTY>
+</INSTANCE>
+</VALUE.NAMEDINSTANCE>
+<VALUE.NAMEDINSTANCE>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">7</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCE CLASSNAME="TEST_PulledInstance">
+<PROPERTY NAME="Identifier" TYPE="uint32">
+<VALUE>7</VALUE>
+</PROPERTY>
+</INSTANCE>
+</VALUE.NAMEDINSTANCE>
+<VALUE.NAMEDINSTANCE>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">8</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCE CLASSNAME="TEST_PulledInstance">
+<PROPERTY NAME="Identifier" TYPE="uint32">
+<VALUE>8</VALUE>
+</PROPERTY>
+</INSTANCE>
+</VALUE.NAMEDINSTANCE>
+<VALUE.NAMEDINSTANCE>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">9</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCE CLASSNAME="TEST_PulledInstance">
+<PROPERTY NAME="Identifier" TYPE="uint32">
+<VALUE>9</VALUE>
+</PROPERTY>
+</INSTANCE>
+</VALUE.NAMEDINSTANCE>
+<VALUE.NAMEDINSTANCE>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">10</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCE CLASSNAME="TEST_PulledInstance">
+<PROPERTY NAME="Identifier" TYPE="uint32">
+<VALUE>10</VALUE>
+</PROPERTY>
+</INSTANCE>
+</VALUE.NAMEDINSTANCE>
+<VALUE.NAMEDINSTANCE>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">11</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCE CLASSNAME="TEST_PulledInstance">
+<PROPERTY NAME="Identifier" TYPE="uint32">
+<VALUE>11</VALUE>
+</PROPERTY>
+</INSTANCE>
+</VALUE.NAMEDINSTANCE>
+<VALUE.NAMEDINSTANCE>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">12</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCE CLASSNAME="TEST_PulledInstance">
+<PROPERTY NAME="Identifier" TYPE="uint32">
+<VALUE>12</VALUE>
+</PROPERTY>
+</INSTANCE>
+</VALUE.NAMEDINSTANCE>
+<VALUE.NAMEDINSTANCE>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">13</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCE CLASSNAME="TEST_PulledInstance">
+<PROPERTY NAME="Identifier" TYPE="uint32">
+<VALUE>13</VALUE>
+</PROPERTY>
+</INSTANCE>
+</VALUE.NAMEDINSTANCE>
+<VALUE.NAMEDINSTANCE>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">14</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCE CLASSNAME="TEST_PulledInstance">
+<PROPERTY NAME="Identifier" TYPE="uint32">
+<VALUE>14</VALUE>
+</PROPERTY>
+</INSTANCE>
+</VALUE.NAMEDINSTANCE>
+<VALUE.NAMEDINSTANCE>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">15</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCE CLASSNAME="TEST_PulledInstance">
+<PROPERTY NAME="Identifier" TYPE="uint32">
+<VALUE>15</VALUE>
+</PROPERTY>
+</INSTANCE>
+</VALUE.NAMEDINSTANCE>
+<VALUE.NAMEDINSTANCE>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">16</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCE CLASSNAME="TEST_PulledInstance">
+<PROPERTY NAME="Identifier" TYPE="uint32">
+<VALUE>16</VALUE>
+</PROPERTY>
+</INSTANCE>
+</VALUE.NAMEDINSTANCE>
+</IRETURNVALUE>
+</IMETHODRESPONSE>
+</SIMPLERSP>
+</MESSAGE>
+</CIM>
diff --git a/test/TestProviders/tests/RIEnumIS.XML b/test/TestProviders/tests/PECheckProv01_EnumInst.xml
similarity index 76%
copy from test/TestProviders/tests/RIEnumIS.XML
copy to test/TestProviders/tests/PECheckProv01_EnumInst.xml
index 36c0ff7..2e8ae1a 100644
--- a/test/TestProviders/tests/RIEnumIS.XML
+++ b/test/TestProviders/tests/PECheckProv01_EnumInst.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<CIM CIMVERSION="2.0" DTDVERSION="2.0">
-<MESSAGE ID="4711" PROTOCOLVERSION="1.0"><SIMPLEREQ><IMETHODCALL NAME="EnumerateInstances"><LOCALNAMESPACEPATH><NAMESPACE NAME="root"></NAMESPACE><NAMESPACE NAME="interop"></NAMESPACE></LOCALNAMESPACEPATH>
-<IPARAMVALUE NAME="ClassName"><CLASSNAME NAME="CIM_IndicationService"/></IPARAMVALUE>
+<MESSAGE ID="4711" PROTOCOLVERSION="1.0"><SIMPLEREQ><IMETHODCALL NAME="EnumerateInstances"><LOCALNAMESPACEPATH><NAMESPACE NAME="root"></NAMESPACE><NAMESPACE NAME="cimv2"></NAMESPACE></LOCALNAMESPACEPATH>
+<IPARAMVALUE NAME="ClassName"><CLASSNAME NAME="TEST_PulledInstance"/></IPARAMVALUE>
<IPARAMVALUE NAME="DeepInheritance"><VALUE>TRUE</VALUE></IPARAMVALUE>
<IPARAMVALUE NAME="LocalOnly"><VALUE>FALSE</VALUE></IPARAMVALUE>
<IPARAMVALUE NAME="IncludeQualifiers"><VALUE>FALSE</VALUE></IPARAMVALUE>
diff --git a/test/TestProviders/tests/PECheckProv02_EnumInstNames.OK b/test/TestProviders/tests/PECheckProv02_EnumInstNames.OK
new file mode 100644
index 0000000..663febb
--- /dev/null
+++ b/test/TestProviders/tests/PECheckProv02_EnumInstNames.OK
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<CIM CIMVERSION="2.0" DTDVERSION="2.0">
+<MESSAGE ID="4711" PROTOCOLVERSION="1.0">
+<SIMPLERSP>
+<IMETHODRESPONSE NAME="EnumerateInstanceNames">
+<IRETURNVALUE>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">1</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">2</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">3</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">4</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">5</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">6</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">7</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">8</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">9</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">10</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">11</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">12</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">13</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">14</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">15</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">16</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+</IRETURNVALUE>
+</IMETHODRESPONSE>
+</SIMPLERSP>
+</MESSAGE>
+</CIM>
diff --git a/test/TestProviders/tests/AenumerateInstanceNames.xml b/test/TestProviders/tests/PECheckProv02_EnumInstNames.xml
similarity index 79%
copy from test/TestProviders/tests/AenumerateInstanceNames.xml
copy to test/TestProviders/tests/PECheckProv02_EnumInstNames.xml
index 5aa10a0..7710f46 100644
--- a/test/TestProviders/tests/AenumerateInstanceNames.xml
+++ b/test/TestProviders/tests/PECheckProv02_EnumInstNames.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<CIM CIMVERSION="2.0" DTDVERSION="2.0">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0"><SIMPLEREQ><IMETHODCALL NAME="EnumerateInstanceNames"><LOCALNAMESPACEPATH><NAMESPACE NAME="root"></NAMESPACE><NAMESPACE NAME="cimv2"></NAMESPACE></LOCALNAMESPACEPATH>
-<IPARAMVALUE NAME="ClassName"><CLASSNAME NAME="CMPI_TEST_Person"/></IPARAMVALUE>
+<IPARAMVALUE NAME="ClassName"><CLASSNAME NAME="TEST_PulledInstance"/></IPARAMVALUE>
</IMETHODCALL></SIMPLEREQ>
</MESSAGE></CIM>
diff --git a/test/xmltest/Indication11DeleteSubscription.OK b/test/TestProviders/tests/PECheckProv03_SetCount.OK
similarity index 64%
copy from test/xmltest/Indication11DeleteSubscription.OK
copy to test/TestProviders/tests/PECheckProv03_SetCount.OK
index e450582..b124e3f 100644
--- a/test/xmltest/Indication11DeleteSubscription.OK
+++ b/test/TestProviders/tests/PECheckProv03_SetCount.OK
@@ -2,10 +2,8 @@
<CIM CIMVERSION="2.0" DTDVERSION="2.0">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0">
<SIMPLERSP>
-<IMETHODRESPONSE NAME="DeleteInstance">
-<IRETURNVALUE>
-</IRETURNVALUE>
-</IMETHODRESPONSE>
+<METHODRESPONSE NAME="setCount">
+</METHODRESPONSE>
</SIMPLERSP>
</MESSAGE>
</CIM>
diff --git a/test/TestProviders/tests/PECheckProv03_SetCount.xml b/test/TestProviders/tests/PECheckProv03_SetCount.xml
new file mode 100644
index 0000000..1b0dce1
--- /dev/null
+++ b/test/TestProviders/tests/PECheckProv03_SetCount.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<CIM CIMVERSION="2.0" DTDVERSION="2.0">
+<MESSAGE ID="4711" PROTOCOLVERSION="1.0"><SIMPLEREQ><METHODCALL NAME="setCount"><LOCALCLASSPATH><LOCALNAMESPACEPATH><NAMESPACE NAME="root"/><NAMESPACE NAME="cimv2"/></LOCALNAMESPACEPATH><CLASSNAME NAME="TEST_PulledInstance"/></LOCALCLASSPATH><PARAMVALUE NAME="InstanceCount"><VALUE>1</VALUE></PARAMVALUE></METHODCALL></SIMPLEREQ>
+</MESSAGE></CIM>
diff --git a/test/TestProviders/tests/PECheckProv04_EnumInst.OK b/test/TestProviders/tests/PECheckProv04_EnumInst.OK
new file mode 100644
index 0000000..c983164
--- /dev/null
+++ b/test/TestProviders/tests/PECheckProv04_EnumInst.OK
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<CIM CIMVERSION="2.0" DTDVERSION="2.0">
+<MESSAGE ID="4711" PROTOCOLVERSION="1.0">
+<SIMPLERSP>
+<IMETHODRESPONSE NAME="EnumerateInstances">
+<IRETURNVALUE>
+<VALUE.NAMEDINSTANCE>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">1</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
+<INSTANCE CLASSNAME="TEST_PulledInstance">
+<PROPERTY NAME="Identifier" TYPE="uint32">
+<VALUE>1</VALUE>
+</PROPERTY>
+</INSTANCE>
+</VALUE.NAMEDINSTANCE>
+</IRETURNVALUE>
+</IMETHODRESPONSE>
+</SIMPLERSP>
+</MESSAGE>
+</CIM>
diff --git a/test/TestProviders/tests/RIEnumIS.XML b/test/TestProviders/tests/PECheckProv04_EnumInst.xml
similarity index 76%
copy from test/TestProviders/tests/RIEnumIS.XML
copy to test/TestProviders/tests/PECheckProv04_EnumInst.xml
index 36c0ff7..2e8ae1a 100644
--- a/test/TestProviders/tests/RIEnumIS.XML
+++ b/test/TestProviders/tests/PECheckProv04_EnumInst.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<CIM CIMVERSION="2.0" DTDVERSION="2.0">
-<MESSAGE ID="4711" PROTOCOLVERSION="1.0"><SIMPLEREQ><IMETHODCALL NAME="EnumerateInstances"><LOCALNAMESPACEPATH><NAMESPACE NAME="root"></NAMESPACE><NAMESPACE NAME="interop"></NAMESPACE></LOCALNAMESPACEPATH>
-<IPARAMVALUE NAME="ClassName"><CLASSNAME NAME="CIM_IndicationService"/></IPARAMVALUE>
+<MESSAGE ID="4711" PROTOCOLVERSION="1.0"><SIMPLEREQ><IMETHODCALL NAME="EnumerateInstances"><LOCALNAMESPACEPATH><NAMESPACE NAME="root"></NAMESPACE><NAMESPACE NAME="cimv2"></NAMESPACE></LOCALNAMESPACEPATH>
+<IPARAMVALUE NAME="ClassName"><CLASSNAME NAME="TEST_PulledInstance"/></IPARAMVALUE>
<IPARAMVALUE NAME="DeepInheritance"><VALUE>TRUE</VALUE></IPARAMVALUE>
<IPARAMVALUE NAME="LocalOnly"><VALUE>FALSE</VALUE></IPARAMVALUE>
<IPARAMVALUE NAME="IncludeQualifiers"><VALUE>FALSE</VALUE></IPARAMVALUE>
diff --git a/test/xmltest/getQualifier.OK b/test/TestProviders/tests/PECheckProv05_EnumInstNames.OK
similarity index 50%
copy from test/xmltest/getQualifier.OK
copy to test/TestProviders/tests/PECheckProv05_EnumInstNames.OK
index 7ea45b9..20500d1 100644
--- a/test/xmltest/getQualifier.OK
+++ b/test/TestProviders/tests/PECheckProv05_EnumInstNames.OK
@@ -2,12 +2,13 @@
<CIM CIMVERSION="2.0" DTDVERSION="2.0">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0">
<SIMPLERSP>
-<IMETHODRESPONSE NAME="GetQualifier">
+<IMETHODRESPONSE NAME="EnumerateInstanceNames">
<IRETURNVALUE>
-<QUALIFIER.DECLARATION NAME="Association" TYPE="boolean" OVERRIDABLE="false" TOSUBCLASS="true">
-<SCOPE ASSOCIATION="true"></SCOPE>
-<VALUE>FALSE</VALUE>
-</QUALIFIER.DECLARATION>
+<INSTANCENAME CLASSNAME="TEST_PulledInstance">
+<KEYBINDING NAME="Identifier">
+<KEYVALUE VALUETYPE="numeric">1</KEYVALUE>
+</KEYBINDING>
+</INSTANCENAME>
</IRETURNVALUE>
</IMETHODRESPONSE>
</SIMPLERSP>
diff --git a/test/TestProviders/tests/AenumerateInstanceNames.xml b/test/TestProviders/tests/PECheckProv05_EnumInstNames.xml
similarity index 79%
copy from test/TestProviders/tests/AenumerateInstanceNames.xml
copy to test/TestProviders/tests/PECheckProv05_EnumInstNames.xml
index 5aa10a0..7710f46 100644
--- a/test/TestProviders/tests/AenumerateInstanceNames.xml
+++ b/test/TestProviders/tests/PECheckProv05_EnumInstNames.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<CIM CIMVERSION="2.0" DTDVERSION="2.0">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0"><SIMPLEREQ><IMETHODCALL NAME="EnumerateInstanceNames"><LOCALNAMESPACEPATH><NAMESPACE NAME="root"></NAMESPACE><NAMESPACE NAME="cimv2"></NAMESPACE></LOCALNAMESPACEPATH>
-<IPARAMVALUE NAME="ClassName"><CLASSNAME NAME="CMPI_TEST_Person"/></IPARAMVALUE>
+<IPARAMVALUE NAME="ClassName"><CLASSNAME NAME="TEST_PulledInstance"/></IPARAMVALUE>
</IMETHODCALL></SIMPLEREQ>
</MESSAGE></CIM>
diff --git a/test/schema/root/cimv2/Test_PulledInstance.mof b/test/schema/root/cimv2/Test_PulledInstance.mof
new file mode 100644
index 0000000..9ae9e5d
--- /dev/null
+++ b/test/schema/root/cimv2/Test_PulledInstance.mof
@@ -0,0 +1,8 @@
+[Version ("1.0.0")]
+class TEST_PulledInstance
+{
+ [key,
+ read]
+ Uint32 Identifier;
+ string setCount ( [IN] uint32 InstanceCount);
+};
diff --git a/test/schema/root/cimv2/Test_PulledInstance.reg b/test/schema/root/cimv2/Test_PulledInstance.reg
new file mode 100644
index 0000000..2862d28
--- /dev/null
+++ b/test/schema/root/cimv2/Test_PulledInstance.reg
@@ -0,0 +1,6 @@
+[TEST_PulledInstance]
+ provider: TestPulledInstanceProvider
+ location: TestPulledInstanceProvider
+ namespace: root/cimv2
+ type: instance method
+#
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
