You can subscribe to this list here.
| 2005 |
Jan
|
Feb
(1) |
Mar
(45) |
Apr
(150) |
May
(145) |
Jun
(150) |
Jul
(79) |
Aug
(313) |
Sep
(160) |
Oct
(309) |
Nov
(115) |
Dec
(60) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(160) |
Feb
(144) |
Mar
(127) |
Apr
(48) |
May
(102) |
Jun
(54) |
Jul
(245) |
Aug
(94) |
Sep
(152) |
Oct
(162) |
Nov
(166) |
Dec
(740) |
| 2007 |
Jan
(752) |
Feb
(437) |
Mar
(328) |
Apr
(373) |
May
(569) |
Jun
(399) |
Jul
(369) |
Aug
(627) |
Sep
(100) |
Oct
(306) |
Nov
(166) |
Dec
(282) |
| 2008 |
Jan
(68) |
Feb
(145) |
Mar
(180) |
Apr
(160) |
May
(277) |
Jun
(229) |
Jul
(1188) |
Aug
(51) |
Sep
(97) |
Oct
(99) |
Nov
(95) |
Dec
(170) |
| 2009 |
Jan
(39) |
Feb
(73) |
Mar
(120) |
Apr
(121) |
May
(104) |
Jun
(262) |
Jul
(57) |
Aug
(171) |
Sep
(131) |
Oct
(88) |
Nov
(64) |
Dec
(83) |
| 2010 |
Jan
(55) |
Feb
(67) |
Mar
(124) |
Apr
(64) |
May
(130) |
Jun
(75) |
Jul
(164) |
Aug
(64) |
Sep
(44) |
Oct
(17) |
Nov
(43) |
Dec
(31) |
| 2011 |
Jan
(21) |
Feb
(10) |
Mar
(43) |
Apr
(46) |
May
(52) |
Jun
(71) |
Jul
(7) |
Aug
(16) |
Sep
(51) |
Oct
(14) |
Nov
(33) |
Dec
(15) |
| 2012 |
Jan
(12) |
Feb
(61) |
Mar
(129) |
Apr
(76) |
May
(70) |
Jun
(52) |
Jul
(29) |
Aug
(41) |
Sep
(32) |
Oct
(23) |
Nov
(38) |
Dec
(26) |
| 2013 |
Jan
(35) |
Feb
(37) |
Mar
(51) |
Apr
(15) |
May
(52) |
Jun
(15) |
Jul
(23) |
Aug
(21) |
Sep
(46) |
Oct
(69) |
Nov
(57) |
Dec
(26) |
| 2014 |
Jan
(5) |
Feb
(13) |
Mar
(17) |
Apr
(1) |
May
(5) |
Jun
|
Jul
(2) |
Aug
(2) |
Sep
(1) |
Oct
(16) |
Nov
(8) |
Dec
(4) |
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(1) |
Jun
(4) |
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
|
From: Chris B. <buc...@us...> - 2012-05-30 21:26:36
|
Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv12149
Modified Files:
cimXmlOps.y ChangeLog NEWS
Log Message:
[ 3527620 ] EnumerateClasses does not include qualifiers by default
Index: cimXmlOps.y
===================================================================
RCS file: /cvsroot/sblim/sfcb/cimXmlOps.y,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- cimXmlOps.y 12 Mar 2012 22:30:52 -0000 1.32
+++ cimXmlOps.y 30 May 2012 21:26:33 -0000 1.33
@@ -1146,7 +1146,7 @@
$$.op.type = OPS_EnumerateClasses;
$$.op.nameSpace=setCharsMsgSegment($1);
$$.op.className=setCharsMsgSegment(NULL);
- $$.flags = FL_localOnly;
+ $$.flags = FL_localOnly|FL_includeQualifiers;
setRequest(parm,&$$,sizeof(XtokEnumClasses),OPS_EnumerateClasses);
}
@@ -1156,7 +1156,7 @@
$$.op.type = OPS_EnumerateClasses;
$$.op.nameSpace=setCharsMsgSegment($1);
$$.op.className=setCharsMsgSegment($2.className);
- $$.flags = ($2.flags & $2.flagsSet) | ((~$2.flagsSet) & FL_localOnly);
+ $$.flags = ($2.flags & $2.flagsSet) | ((~$2.flagsSet) & (FL_localOnly|FL_includeQualifiers));
setRequest(parm,&$$,sizeof(XtokEnumClasses),OPS_EnumerateClasses);
}
Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.691
retrieving revision 1.692
diff -u -d -r1.691 -r1.692
--- NEWS 25 May 2012 22:08:21 -0000 1.691
+++ NEWS 30 May 2012 21:26:33 -0000 1.692
@@ -21,6 +21,7 @@
- 3528074 Improve CMPIInstance Error Codes
- 3528096 Error status codes sometimes not propigated for instances
- 3529856 httpProcs limit can be broken
+- 3527620 EnumerateClasses does not include qualifiers by default
Changes in 1.3.14
=================
Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.772
retrieving revision 1.773
diff -u -d -r1.772 -r1.773
--- ChangeLog 25 May 2012 22:08:21 -0000 1.772
+++ ChangeLog 30 May 2012 21:26:33 -0000 1.773
@@ -1,3 +1,8 @@
+2012-05-30 Chris Buccella <buc...@li...>
+
+ * cimXmlOps.y:
+ [ 3527620 ] EnumerateClasses does not include qualifiers by default
+
2012-05-25 Chris Buccella <buc...@li...>
* msgqueue.c:
|
|
From: Tyrel D. <ty...@us...> - 2012-05-29 21:50:45
|
Update of /cvsroot/sblim/gather
In directory vz-cvs-3.sog:/tmp/cvs-serv24051
Modified Files:
NEWS repos.c
Log Message:
Fixed 3530668: Duration values always reported as zero
Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/gather/NEWS,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- NEWS 17 May 2012 01:02:41 -0000 1.123
+++ NEWS 29 May 2012 21:50:43 -0000 1.124
@@ -2,6 +2,7 @@
========================
Bugs fixed:
+- 3530668 Duration values always reported as zero
Features added:
- 3031802 add support for CIM property filters
Index: repos.c
===================================================================
RCS file: /cvsroot/sblim/gather/repos.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- repos.c 15 Dec 2010 00:41:09 -0000 1.29
+++ repos.c 29 May 2012 21:50:43 -0000 1.30
@@ -373,8 +373,7 @@
if (useIntervals) {
vs->vsValues[actnum].viCaptureTime=mv[j][0].mvTimeStamp;
vs->vsValues[actnum].viDuration=
- mv[j][0].mvTimeStamp -
- vs->vsValues[actnum].viCaptureTime;
+ vs->vsValues[actnum].viCaptureTime - mv[j][numv[j]-1].mvTimeStamp;
vs->vsValues[actnum].viValueLen=100; /* TODO : calc meaningful length */
vs->vsValues[actnum].viSystemId=ch_alloc(ch,syslen);
memcpy(vs->vsValues[actnum].viSystemId,mv[j][numv[j]-1].mvSystemId,syslen);
|
|
From: Chris B. <buc...@us...> - 2012-05-29 18:16:44
|
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 "SFCC - Small Footprint CIM Client".
The branch, master has been updated
via 167dcc80e145e486139266560b284aed7aa20f36 (commit)
from 087eff10b2389b8834778aa2907ecca07ab10e66 (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 167dcc80e145e486139266560b284aed7aa20f36
Author: buccella <buc...@li...>
Date: Tue May 29 14:16:44 2012 -0400
[ 3530609 ] Various BEAM Errors
-----------------------------------------------------------------------
Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index dd27ffe..86bf9af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2012-05-29 Chris Buccella <buc...@li...>
+ * TEST/v2test_ecn.c, backend/cimxml/cimXmlParser.c,
+ backend/cimxml/client.c, backend/cimxml/objectpath.c,
+ backend/cimxml/parserUtil.c, backend/cimxml/value.c:
+ [ 3530609 ] Various BEAM Errors
+
* backend/cimxml/property.c:
[ 3528819 ] Crash in getInstance when instance has NULL properties
(patch by Klaus Kampf)
diff --git a/NEWS b/NEWS
index 0652caa..2bd79aa 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ Bugs:
- 3344757: Beam, deref of potential Null pointers.
- 3344917: Beam, file leak
- 3528819: Crash in getInstance when instance has NULL properties
+- 3530609: Various BEAM Errors
Changes in 2.2.3
================
diff --git a/TEST/v2test_ecn.c b/TEST/v2test_ecn.c
index 35b1e65..104ea4a 100644
--- a/TEST/v2test_ecn.c
+++ b/TEST/v2test_ecn.c
@@ -26,7 +26,7 @@ int main()
int rc;
CIMCStatus status;
CIMCClient *client;
- CIMCObjectPath *op;
+ CIMCObjectPath *op, *cop;
CIMCEnumeration *enm;
CIMCString *path;
CIMCData data;
@@ -74,9 +74,9 @@ int main()
return 1;
}
- op = ce->ft->newObjectPath(ce, "root/cimv2", NULL , &status);
+ cop = ce->ft->newObjectPath(ce, "root/cimv2", NULL , &status);
printf(" calling enumClassNames \n") ;
- enm = client->ft->enumClassNames(client, op, 0 , &status);
+ enm = client->ft->enumClassNames(client, cop, 0 , &status);
printf(" back from enumClassNames \n") ;
@@ -95,7 +95,7 @@ int main()
}
if(enm) enm->ft->release(enm);
- if(op) op->ft->release(op);
+ if(cop) cop->ft->release(cop);
if(client) client->ft->release(client);
if(ce) ce->ft->release(ce);
if(status.msg) CMRelease(status.msg);
diff --git a/backend/cimxml/cimXmlParser.c b/backend/cimxml/cimXmlParser.c
index c6a0908..b7b590e 100644
--- a/backend/cimxml/cimXmlParser.c
+++ b/backend/cimxml/cimXmlParser.c
@@ -281,7 +281,7 @@ static int attrsOk(XmlBuffer * xb, const XmlElement * e, XmlAttr * r,
strcat(ptr," ");
strcat(ptr, tag);
Throw(xb, ptr);
- return -1;
+ return 0;
}
/* Is this Broken? I guess we don't allow escaping the quotes */
@@ -505,7 +505,7 @@ static int procIRetValue(parseUnion * lvalp, ParserControl * parm)
{NULL}
};
XmlAttr attr[0];
- memset(attr, 0, sizeof(attr));
+ // memset(attr, 0, sizeof(attr));
if (attrsOk(parm->xmb, elm, attr, "IRETURNVALUE", ZTOK_IRETVALUE)) {
return XTOK_IRETVALUE;
}
diff --git a/backend/cimxml/client.c b/backend/cimxml/client.c
index d38fd87..69b2848 100644
--- a/backend/cimxml/client.c
+++ b/backend/cimxml/client.c
@@ -2946,7 +2946,7 @@ static CIMCClient *xmlConnect2(CIMCEnv *env, const char *hn, const char *scheme,
curl_easy_setopt(cc->connection->mHandle,CURLOPT_SSLKEY,keyFile);
}
- CMSetStatus(rc, CMPI_RC_OK);
+ CMSetStatus(rc, CIMC_RC_OK);
return (CIMCClient*)cc;
}
diff --git a/backend/cimxml/objectpath.c b/backend/cimxml/objectpath.c
index a23b71d..cbb7dbd 100644
--- a/backend/cimxml/objectpath.c
+++ b/backend/cimxml/objectpath.c
@@ -104,9 +104,9 @@ static CMPIStatus __oft_setNameSpace ( CMPIObjectPath * cop,
{
struct native_cop * o = (struct native_cop *) cop;
- char * ns = ( nameSpace )? strdup ( nameSpace ): NULL;
-
if ( o ) {
+ char * ns = ( nameSpace )? strdup ( nameSpace ): NULL;
+
if ( o->nameSpace )
free ( o->nameSpace );
o->nameSpace = ns;
@@ -143,9 +143,9 @@ static CMPIStatus __oft_setClassName ( CMPIObjectPath * cop,
{
struct native_cop * o = (struct native_cop *) cop;
- char * cn = ( classname )? strdup ( classname ): NULL;
-
if ( o ) {
+ char * cn = ( classname )? strdup ( classname ): NULL;
+
if ( o->classname )
free ( o->classname );
o->classname = cn;
@@ -453,7 +453,7 @@ UtilList *getNameSpaceComponents(CMPIObjectPath * cop)
if (nss && nss->hdl) {
ns=(char*)nss->hdl;
- if (ns) for (s=i=0, m=strlen(ns); i<m; i++,s++) {
+ for (s=i=0, m=strlen(ns); i<m; i++,s++) {
if (ns[i]=='/') {
nsc[s]=0;
ul->ft->append(ul,strdup(nsc));
diff --git a/backend/cimxml/parserUtil.c b/backend/cimxml/parserUtil.c
index 9fa761e..cee43b0 100644
--- a/backend/cimxml/parserUtil.c
+++ b/backend/cimxml/parserUtil.c
@@ -85,7 +85,7 @@ void setInstProperties(CMPIInstance *ci, XtokProperties *ps)
CMPIValue val;
CMPIObjectPath *op;
CMPIStatus status;
- CMPIType type = NULL;
+ CMPIType type = CMPI_null;
XtokQualifier *nq = NULL,*q;
XtokQualifiers *qs;
int rc, n, setq;
diff --git a/backend/cimxml/value.c b/backend/cimxml/value.c
index bcc46df..026328d 100644
--- a/backend/cimxml/value.c
+++ b/backend/cimxml/value.c
@@ -110,37 +110,30 @@ CMPIValue native_clone_CMPIValue ( CMPIType type,
switch ( type ) {
case CMPI_instance:
- if (val->inst)
v.inst = CMClone ( val->inst, rc );
break;
case CMPI_ref:
- if (val->ref)
v.ref = CMClone ( val->ref, rc );
break;
case CMPI_args:
- if (val->args)
v.args = CMClone ( val->args, rc );
break;
case CMPI_enumeration:
- if (val->Enum)
v.Enum = CMClone ( val->Enum, rc );
break;
case CMPI_string:
- if (val->string)
v.string = CMClone ( val->string, rc );
break;
case CMPI_chars:
- if (val->chars)
v.chars = strdup ( val->chars );
break;
case CMPI_dateTime:
- if (val->dateTime)
v.dateTime = CMClone ( val->dateTime, rc );
break;
}
hooks/post-receive
--
SFCC - Small Footprint CIM Client
|
|
From: Chris B. <buc...@us...> - 2012-05-29 18:03:49
|
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 "SFCC - Small Footprint CIM Client".
The branch, master has been updated
via 087eff10b2389b8834778aa2907ecca07ab10e66 (commit)
from 9ea0e948eb61e753539f42231223968a1a81d6cb (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 087eff10b2389b8834778aa2907ecca07ab10e66
Author: buccella <buc...@li...>
Date: Tue May 29 13:58:09 2012 -0400
[ 3528819 ] Crash in getInstance when instance has NULL properties
-----------------------------------------------------------------------
Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index a90147c..dd27ffe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-29 Chris Buccella <buc...@li...>
+
+ * backend/cimxml/property.c:
+ [ 3528819 ] Crash in getInstance when instance has NULL properties
+ (patch by Klaus Kampf)
+
2011-06-29 Michael Chase-Salerno <br...@li...>
* cimc/cimcclient.c:
diff --git a/NEWS b/NEWS
index 1c6463e..0652caa 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ Bugs:
- 3344403: Beam, unitialized vars
- 3344757: Beam, deref of potential Null pointers.
- 3344917: Beam, file leak
+- 3528819: Crash in getInstance when instance has NULL properties
Changes in 2.2.3
================
diff --git a/backend/cimxml/property.c b/backend/cimxml/property.c
index 592ea2b..2d061bf 100644
--- a/backend/cimxml/property.c
+++ b/backend/cimxml/property.c
@@ -243,15 +243,16 @@ static struct native_property * __clone ( struct native_property * prop,
result->name = strdup ( prop->name );
result->type = prop->type;
result->state = prop->state;
- result->value = native_clone_CMPIValue ( prop->type,
- &prop->value,
- &tmp );
-
- if ( tmp.rc != CMPI_RC_OK ) {
+ if (prop->state != CMPI_nullValue
+ && prop->state != CMPI_badValue) {
+ result->value = native_clone_CMPIValue ( prop->type,
+ &prop->value,
+ &tmp );
+ if ( tmp.rc != CMPI_RC_OK ) {
result->state = CMPI_nullValue;
- }
-
+ }
+ }
result->qualifiers = qualifierFT.clone ( prop->qualifiers, rc );
result->next = __clone ( prop->next, rc );
diff --git a/contributions.txt b/contributions.txt
index d37e6a4..0a2984c 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -38,6 +38,7 @@ Klaus Kampf, Novell
09/22/2009 [ 2849853 ] getClass reports most property types as CMPI_Instance
03/23/2011 [ 2990315 ] cmciRelease not called in case of error
04/25/2011 [ 2967265 ] code cleanup in sfcclient
+05/29/2012 [ 3528819 ] Crash in getInstance when instance has NULL properties
Suresh Sundriyal, VMWare
------------------------
hooks/post-receive
--
SFCC - Small Footprint CIM Client
|
|
From: Dave H. <hel...@us...> - 2012-05-26 01:59:43
|
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 e8a80e2cf2318dde85c75be2e6e0669eee0f9849 (commit)
from 80ea81cb2581fb8c51506a7233e70799e0763bc7 (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 e8a80e2cf2318dde85c75be2e6e0669eee0f9849
Author: Dave Heller <hel...@us...>
Date: Fri May 25 21:53:07 2012 -0400
[ 3529879 ] Fixes for sfcb-ps test script
-----------------------------------------------------------------------
Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 5792064..0d8af75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-25 Dave Heller <hel...@us...>
+
+ * extra/sfcb-ps:
+ [ 3529879 ] Fixes for sfcb-ps test script
+
2012-05-25 Chris Buccella <buc...@li...>
* msgqueue.c:
diff --git a/NEWS b/NEWS
index 6da8d76..6af9eee 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ Bugs fixed:
- 3516167 Force kill sfcbd on stop if needed
- 2966659 Cleanup https daemon remnants
- 3527674 Faster Startup
+- 3529879 Fixes for sfcb-ps test script
Changes in 1.4.2
================
diff --git a/extra/sfcb-ps b/extra/sfcb-ps
index ba15f95..0a24901 100755
--- a/extra/sfcb-ps
+++ b/extra/sfcb-ps
@@ -124,10 +124,10 @@ done
if [ -n "$USE_PROC" ] ; then
# For busybox ps
- PS_INFO=$(ps | grep '[s]fcbd')
+ PS_INFO=$(ps | grep '[s]fcbd\b')
else
# Get everything from (standard) ps command
- PS_INFO=$(ps -e -o pid,ppid,pgid,stat,cmd | grep '[s]fcbd')
+ PS_INFO=$(ps -e -o pid,ppid,pgid,stat,cmd | grep '[s]fcbd\b')
fi
if [ -n "$RAW_PS" ] ; then
@@ -175,7 +175,8 @@ echo "$PS_INFO" | while read pid ppid pgid stat cmd ; do
SOCKET_TEST="`cat /proc/net/tcp* | grep ":176[45]" | \
grep -o '\:\([0-9,A-F]\{8\} \)\{2\}\( *[0-9]*\)\{3\}' | \
grep -o ' [0-9]*$' | \
- while read inode; do ls -l /proc/$pid/fd/ | grep $inode; done`"
+ while read inode; do [ $inode -ne 0 ] && \
+ ls -l /proc/$pid/fd/ | grep $inode; done`"
else
# Use standard lsof for socket test
SOCKET_TEST="`lsof -n -w -a -i :5988 -i :5989 -p $pid`"
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Chris B. <buc...@us...> - 2012-05-25 22:46:47
|
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 80ea81cb2581fb8c51506a7233e70799e0763bc7 (commit)
from 67ee27398d5fcce339c4cce9a8bfbd2b41f3cf2c (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 80ea81cb2581fb8c51506a7233e70799e0763bc7
Author: buccella <buc...@li...>
Date: Fri May 25 18:47:36 2012 -0400
[ 3529856 ] httpProcs limit can be broken
-----------------------------------------------------------------------
Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 10b3db8..5792064 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-25 Chris Buccella <buc...@li...>
+
+ * msgqueue.c:
+ [ 3529856 ] httpProcs limit can be broken
+
2012-05-23 Michael Chase-Salerno <br...@li...>
* control.h, indCIMXMLHandler.c, interopServerProvider.c,
diff --git a/NEWS b/NEWS
index b6112fe..6da8d76 100644
--- a/NEWS
+++ b/NEWS
@@ -108,6 +108,7 @@ Bugs Fixed:
- 3524819 sfcb may hang on ac call to indication subscription
- 3528074 Improve CMPIInstance Error Codes
- 3528096 Error status codes sometimes not propigated for instances
+- 3529856 httpProcs limit can be broken
Changes in 1.3.14
=================
diff --git a/msgqueue.c b/msgqueue.c
index 61158ea..4bc51f5 100644
--- a/msgqueue.c
+++ b/msgqueue.c
@@ -64,7 +64,7 @@ semAcquireUnDo(int semid, int semnum)
int rc;
struct sembuf semBuf = { semnum, -1, SEM_UNDO };
- rc = semop(semid, &semBuf, 1);
+ while ((rc=semop(semid,&semBuf,1) < 0) && (errno == EINTR));
return rc;
}
@@ -74,7 +74,7 @@ semAcquire(int semid, int semnum)
int rc;
struct sembuf semBuf = { semnum, -1, 0 };
- rc = semop(semid, &semBuf, 1);
+ while ((rc=semop(semid,&semBuf,1) < 0) && (errno == EINTR));
return rc;
}
@@ -83,8 +83,7 @@ semRelease(int semid, int semnum)
{
int rc;
struct sembuf semBuf = { semnum, 1, 0 };
-
- rc = semop(semid, &semBuf, 1);
+ while ((rc=semop(semid,&semBuf,1) < 0) && (errno == EINTR));
return rc;
}
@@ -93,17 +92,17 @@ semReleaseUnDo(int semid, int semnum)
{
int rc;
struct sembuf semBuf = { semnum, 1, SEM_UNDO };
-
- rc = semop(semid, &semBuf, 1);
+ while ((rc=semop(semid,&semBuf,1) < 0) && (errno == EINTR));
return rc;
}
int
semMultiRelease(int semid, int semnum, int n)
{
+ int rc;
struct sembuf semBuf = { semnum, 1, 0 };
-
- return semop(semid, &semBuf, n);
+ while ((rc=semop(semid,&semBuf,n) < 0) && (errno == EINTR));
+ return rc;
}
int
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Chris B. <buc...@us...> - 2012-05-25 22:26:16
|
Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv17893
Modified Files:
msgqueue.c
Log Message:
[ 3529856 ] httpProcs limit can be broken
Index: msgqueue.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/msgqueue.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- msgqueue.c 25 May 2012 22:08:20 -0000 1.39
+++ msgqueue.c 25 May 2012 22:26:13 -0000 1.40
@@ -64,7 +64,7 @@
int rc;
struct sembuf semBuf = {semnum,-1,SEM_UNDO};
- while ((rc=semop(semid,&semBuf,1)) && (errno == EINTR));
+ while ((rc=semop(semid,&semBuf,1) < 0) && (errno == EINTR));
return rc;
}
@@ -82,7 +82,7 @@
int rc;
struct sembuf semBuf = {semnum,1,0};
- while ((rc=semop(semid,&semBuf,1)) && (errno == EINTR));
+ while ((rc=semop(semid,&semBuf,1) < 0) && (errno == EINTR));
return rc;
}
@@ -91,7 +91,7 @@
int rc;
struct sembuf semBuf = {semnum,1,SEM_UNDO};
- while ((rc=semop(semid,&semBuf,1)) && (errno == EINTR));
+ while ((rc=semop(semid,&semBuf,1) < 0) && (errno == EINTR));
return rc;
}
@@ -99,7 +99,7 @@
{
int rc;
struct sembuf semBuf = {semnum,1,0};
- while ((rc=semop(semid,&semBuf,n)) && (errno == EINTR));
+ while ((rc=semop(semid,&semBuf,n) < 0) && (errno == EINTR));
return rc;
}
|
|
From: Chris B. <buc...@us...> - 2012-05-25 22:08:24
|
Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv16153
Modified Files:
msgqueue.c ChangeLog NEWS
Log Message:
[ 3529856 ] httpProcs limit can be broken
Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.690
retrieving revision 1.691
diff -u -d -r1.690 -r1.691
--- NEWS 21 May 2012 17:22:37 -0000 1.690
+++ NEWS 25 May 2012 22:08:21 -0000 1.691
@@ -20,6 +20,7 @@
- 3524819 sfcb may hang on ac call to indication subscription
- 3528074 Improve CMPIInstance Error Codes
- 3528096 Error status codes sometimes not propigated for instances
+- 3529856 httpProcs limit can be broken
Changes in 1.3.14
=================
Index: msgqueue.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/msgqueue.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- msgqueue.c 17 Nov 2010 16:18:51 -0000 1.38
+++ msgqueue.c 25 May 2012 22:08:20 -0000 1.39
@@ -64,7 +64,7 @@
int rc;
struct sembuf semBuf = {semnum,-1,SEM_UNDO};
- rc=semop(semid,&semBuf,1);
+ while ((rc=semop(semid,&semBuf,1)) && (errno == EINTR));
return rc;
}
@@ -73,7 +73,7 @@
int rc;
struct sembuf semBuf = {semnum,-1,0};
- rc=semop(semid,&semBuf,1);
+ while ((rc=semop(semid,&semBuf,1) < 0) && (errno == EINTR));
return rc;
}
@@ -82,7 +82,7 @@
int rc;
struct sembuf semBuf = {semnum,1,0};
- rc=semop(semid,&semBuf,1);
+ while ((rc=semop(semid,&semBuf,1)) && (errno == EINTR));
return rc;
}
@@ -91,15 +91,16 @@
int rc;
struct sembuf semBuf = {semnum,1,SEM_UNDO};
- rc=semop(semid,&semBuf,1);
+ while ((rc=semop(semid,&semBuf,1)) && (errno == EINTR));
return rc;
}
int semMultiRelease(int semid, int semnum, int n)
{
+ int rc;
struct sembuf semBuf = {semnum,1,0};
-
- return semop(semid,&semBuf,n);
+ while ((rc=semop(semid,&semBuf,n)) && (errno == EINTR));
+ return rc;
}
int semGetValue(int semid, int semnum)
Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.771
retrieving revision 1.772
diff -u -d -r1.771 -r1.772
--- ChangeLog 23 May 2012 21:58:55 -0000 1.771
+++ ChangeLog 25 May 2012 22:08:21 -0000 1.772
@@ -1,3 +1,8 @@
+2012-05-25 Chris Buccella <buc...@li...>
+
+ * msgqueue.c:
+ [ 3529856 ] httpProcs limit can be broken
+
2012-05-23 Michael Chase-Salerno <br...@li...>
* control.h, indCIMXMLHandler.c, interopServerProvider.c,
|
|
From: Michael Chase-S. <mc...@us...> - 2012-05-25 17:27:25
|
Update of /cvsroot/sblim/sfcb/test/TestProviders/tests
In directory vz-cvs-3.sog:/tmp/cvs-serv15596/test/TestProviders/tests
Modified Files:
limitTest.sh
Log Message:
[ 3513390 ] Enforce LD and subscription limits
Don't use wbemcat in the test script
Index: limitTest.sh
===================================================================
RCS file: /cvsroot/sblim/sfcb/test/TestProviders/tests/limitTest.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- limitTest.sh 24 May 2012 21:03:13 -0000 1.3
+++ limitTest.sh 25 May 2012 17:27:22 -0000 1.4
@@ -163,8 +163,8 @@
sendxml ./limitTest.xml /dev/null
rm ./limitTest.xml
rm ./limitTest.result
- wbemcat IndTest7DeleteFilter.xml > /dev/null
- wbemcat limitTestDF2.XML > /dev/null
+ sendxml IndTest7DeleteFilter.xml /dev/null
+ sendxml limitTestDF2.XML /dev/null
}
# Start of main
@@ -356,8 +356,8 @@
# Create 100 subs
lim=100
j=1
-wbemcat IndTest1CreateFilter.xml > /dev/null
-wbemcat limitTestCF2.XML > /dev/null
+sendxml IndTest1CreateFilter.xml /dev/null
+sendxml limitTestCF2.XML /dev/null
echo -n " Testing Sub limit "
while [ $j -le $lim ]
do
@@ -388,7 +388,7 @@
XML=$PRE"limitTest_f2"$MID"limitTest_1"$POST
echo $XML > ./limitTest.xml
sendxml ./limitTest.xml ./limit.result
-wbemcat limitTestDS2.XML > /dev/null
+sendxml limitTestDS2.XML /dev/null
grep "limitTest" ./limit.result >/dev/null 2>&1
if [ $? -eq 0 ]
then
@@ -409,8 +409,8 @@
exit 1;
fi
# but we shouldn't be able to activate it.
-wbemcat limitTestEnableSub.XML > ./limit.result
-wbemcat limitTestDS2.XML > /dev/null
+sendxml limitTestEnableSub.XML ./limit.result
+sendxml limitTestDS2.XML /dev/null
grep "MaxActiveSubscription" ./limit.result >/dev/null 2>&1
if [ $? -ne 0 ]
then
|
|
From: Michael Chase-S. <mc...@us...> - 2012-05-25 15:50:37
|
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 67ee27398d5fcce339c4cce9a8bfbd2b41f3cf2c (commit)
from 53746007381cac413a0c123f855f0adb27eea90f (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 67ee27398d5fcce339c4cce9a8bfbd2b41f3cf2c
Author: Michael Chase-Salerno <br...@li...>
Date: Fri May 25 11:50:03 2012 -0400
[ 3513390 ] Enforce LD and subscription limits
Don't use wbemcat in the test script
-----------------------------------------------------------------------
Summary of changes:
diff --git a/test/TestProviders/tests/limitTest.sh b/test/TestProviders/tests/limitTest.sh
index 22f6c16..1ad4656 100755
--- a/test/TestProviders/tests/limitTest.sh
+++ b/test/TestProviders/tests/limitTest.sh
@@ -163,8 +163,8 @@ cleanup () {
sendxml ./limitTest.xml /dev/null
rm ./limitTest.xml
rm ./limitTest.result
- wbemcat IndTest7DeleteFilter.xml > /dev/null
- wbemcat limitTestDF2.XML > /dev/null
+ sendxml IndTest7DeleteFilter.xml /dev/null
+ sendxml limitTestDF2.XML /dev/null
}
# Start of main
@@ -356,8 +356,8 @@ POSTD='</KEYVALUE>
# Create 100 subs
lim=100
j=1
-wbemcat IndTest1CreateFilter.xml > /dev/null
-wbemcat limitTestCF2.XML > /dev/null
+sendxml IndTest1CreateFilter.xml /dev/null
+sendxml limitTestCF2.XML /dev/null
echo -n " Testing Sub limit "
while [ $j -le $lim ]
do
@@ -388,7 +388,7 @@ done
XML=$PRE"limitTest_f2"$MID"limitTest_1"$POST
echo $XML > ./limitTest.xml
sendxml ./limitTest.xml ./limit.result
-wbemcat limitTestDS2.XML > /dev/null
+sendxml limitTestDS2.XML /dev/null
grep "limitTest" ./limit.result >/dev/null 2>&1
if [ $? -eq 0 ]
then
@@ -409,8 +409,8 @@ then
exit 1;
fi
# but we shouldn't be able to activate it.
-wbemcat limitTestEnableSub.XML > ./limit.result
-wbemcat limitTestDS2.XML > /dev/null
+sendxml limitTestEnableSub.XML ./limit.result
+sendxml limitTestDS2.XML /dev/null
grep "MaxActiveSubscription" ./limit.result >/dev/null 2>&1
if [ $? -ne 0 ]
then
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Dave B. <bla...@us...> - 2012-05-25 15:19:32
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/doc-files
In directory vz-cvs-3.sog:/tmp/cvs-serv26165/src/org/sblim/cimclient/doc-files
Modified Files:
Tag: Experimental
unittest.html
Log Message:
3529062 - WBEMListenerFactory should return new instance
Index: unittest.html
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/doc-files/unittest.html,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -d -r1.1.2.21 -r1.1.2.22
--- unittest.html 3 May 2012 11:14:13 -0000 1.1.2.21
+++ unittest.html 25 May 2012 15:19:29 -0000 1.1.2.22
@@ -30,6 +30,7 @@
* 3513353 2012-03-30 blaschke-oss TCK: CIMDataType arrays must have length >= 1
* 3466280 2012-04-23 blaschke-oss get instance failure for CIM_IndicationSubscription
* 3522904 2012-05-02 blaschke-oss Add new API WBEMClientSBLIM.isActive()
+ * 3529062 2012-05-23 blaschke-oss WBEMListenerFactory should return new instance
-->
</head>
<body style="background-color: white;">
@@ -169,6 +170,13 @@
closing, and after closing.</td></tr>
</table>
+<h3>wbem.WBEMListenerTest</h3>
+ <table border="1" cellpadding="5" cellspacing="0" width="100%">
+ <tr><td>testListenerInstance</td>
+ <td>Tests that WBEMListenerFactory returns unique instances of
+ WBEMListener.</td></tr>
+ </table>
+
<h3>cim.CIMDataTypeTest</h3>
<table border="1" cellpadding="5" cellspacing="0" width="100%">
<tr><td>testScalarDataTypes</td>
|
|
From: Dave B. <bla...@us...> - 2012-05-25 11:27:45
|
Update of /cvsroot/sblim/jsr48-client In directory vz-cvs-3.sog:/tmp/cvs-serv29806 Modified Files: NEWS Log Message: 3525914 - TCK: SetPropertyTest.testSetProperty failing Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.302 retrieving revision 1.303 diff -u -d -r1.302 -r1.303 --- NEWS 25 May 2012 11:20:59 -0000 1.302 +++ NEWS 25 May 2012 11:27:43 -0000 1.303 @@ -1,5 +1,6 @@ Changes in HEAD ================ +3525914 TCK: SetPropertyTest.testSetProperty failing 3521157 JSR48 1.0.0: PROP_ENABLE_*_LOGGING is Level, not 0/1 3525657 Sync up javax.* javadoc with JSR48 1.0.0 Final III 3525150 Remove CIMGetClassOp.getPropertyLis |
|
From: Dave B. <bla...@us...> - 2012-05-25 11:21:02
|
Update of /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/util
In directory vz-cvs-3.sog:/tmp/cvs-serv27724/utst/org/sblim/cimclient/unittest/util
Modified Files:
WBEMConfigurationTest.java
Log Message:
3521157 - JSR48 1.0.0: PROP_ENABLE_*_LOGGING is Level, not 0/1
Index: WBEMConfigurationTest.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/util/WBEMConfigurationTest.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- WBEMConfigurationTest.java 9 May 2012 14:18:44 -0000 1.18
+++ WBEMConfigurationTest.java 25 May 2012 11:21:00 -0000 1.19
@@ -25,6 +25,7 @@
* 3514685 2012-04-03 blaschke-oss TCK: getProperty must return default values
* 3515180 2012-04-05 blaschke-oss JSR48 log dir/file should handle UNIX/Win separators
* 3521119 2012-04-24 blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
+ * 3521157 2012-05-10 blaschke-oss JSR48 1.0.0: PROP_ENABLE_*_LOGGING is Level, not 0/1
*/
package org.sblim.cimclient.unittest.util;
@@ -244,9 +245,8 @@
String pathRelativeLong2 = dirRelativeLong + File.separator + file2;
String invalidProperty = "javax.wbem.client.log.name";
- System.getProperties().remove(WBEMConfigurationProperties.LOG_FILE_LEVEL);
- System.getProperties().remove(WBEMConfigurationProperties.LOG_DEBUG);
System.getProperties().remove(WBEMConfigurationProperties.LOG_CONSOLE_LEVEL);
+ System.getProperties().remove(WBEMConfigurationProperties.LOG_FILE_LEVEL);
System.getProperties().remove(WBEMConfigurationProperties.LOG_FILE_SIZE_LIMIT);
System.getProperties().remove(WBEMConfigurationProperties.LOG_FILE_LOCATION);
System.getProperties().remove(WBEMConfigurationProperties.LOG_FILE_COUNT);
@@ -263,11 +263,9 @@
// All JSR48 properties should be defaults with new client
verify("Uninit enab con", EQUAL, client
- .getProperty(WBEMClientConstants.PROP_ENABLE_CONSOLE_LOGGING), "0");
- verify("Uninit enab dbg", EQUAL, client.getProperty(WBEMClientConstants.PROP_ENABLE_DEBUG),
- "0");
+ .getProperty(WBEMClientConstants.PROP_ENABLE_CONSOLE_LOGGING), "OFF");
verify("Uninit enab file", EQUAL, client
- .getProperty(WBEMClientConstants.PROP_ENABLE_FILE_LOGGING), "0");
+ .getProperty(WBEMClientConstants.PROP_ENABLE_FILE_LOGGING), "OFF");
verify("Uninit byte limit", EQUAL, client
.getProperty(WBEMClientConstants.PROP_LOG_BYTE_LIMIT), "5242880");
verify("Uninit log dir", EQUAL, client.getProperty(WBEMClientConstants.PROP_LOG_DIR), "%t");
@@ -286,9 +284,8 @@
.getProperty(WBEMClientConstants.PROP_CLIENT_TRUSTSTORE), null);
// Setting corresponding SBLIM properties affect JSR48 properties
+ client.setProperty(WBEMConfigurationProperties.LOG_CONSOLE_LEVEL, "WARNING");
client.setProperty(WBEMConfigurationProperties.LOG_FILE_LEVEL, "ALL");
- client.setProperty(WBEMConfigurationProperties.LOG_DEBUG, "true");
- client.setProperty(WBEMConfigurationProperties.LOG_CONSOLE_LEVEL, "OFF");
client.setProperty(WBEMConfigurationProperties.LOG_FILE_SIZE_LIMIT, "1048576");
client.setProperty(WBEMConfigurationProperties.LOG_FILE_LOCATION, pathAbsoluteLong1);
client.setProperty(WBEMConfigurationProperties.LOG_FILE_COUNT, "50");
@@ -299,11 +296,9 @@
client.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH, pathAbsoluteLong2);
verify("SBLIM init enab con", EQUAL, client
- .getProperty(WBEMClientConstants.PROP_ENABLE_CONSOLE_LOGGING), "0");
- verify("SBLIM init enab dbg", EQUAL, client
- .getProperty(WBEMClientConstants.PROP_ENABLE_DEBUG), "1");
+ .getProperty(WBEMClientConstants.PROP_ENABLE_CONSOLE_LOGGING), "WARNING");
verify("SBLIM init enab file", EQUAL, client
- .getProperty(WBEMClientConstants.PROP_ENABLE_FILE_LOGGING), "1");
+ .getProperty(WBEMClientConstants.PROP_ENABLE_FILE_LOGGING), "ALL");
verify("SBLIM init byte limit", EQUAL, client
.getProperty(WBEMClientConstants.PROP_LOG_BYTE_LIMIT), "1048576");
verify("SBLIM init log dir", EQUAL, client.getProperty(WBEMClientConstants.PROP_LOG_DIR),
@@ -324,9 +319,8 @@
.getProperty(WBEMClientConstants.PROP_CLIENT_TRUSTSTORE), pathAbsoluteLong2);
// Set JSR48 properties directly
- client.setProperty(WBEMClientConstants.PROP_ENABLE_CONSOLE_LOGGING, "1");
- client.setProperty(WBEMClientConstants.PROP_ENABLE_DEBUG, "0");
- client.setProperty(WBEMClientConstants.PROP_ENABLE_FILE_LOGGING, "0");
+ client.setProperty(WBEMClientConstants.PROP_ENABLE_CONSOLE_LOGGING, "FINER");
+ client.setProperty(WBEMClientConstants.PROP_ENABLE_FILE_LOGGING, "CONFIG");
client.setProperty(WBEMClientConstants.PROP_LOG_BYTE_LIMIT, "8192");
client.setProperty(WBEMClientConstants.PROP_LOG_DIR, dirAbsolute);
client.setProperty(WBEMClientConstants.PROP_LOG_FILENAME, file2);
@@ -338,11 +332,9 @@
client.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH, pathRelativeLong2);
verify("JSR48 init enab con", EQUAL, client
- .getProperty(WBEMClientConstants.PROP_ENABLE_CONSOLE_LOGGING), "1");
- verify("JSR48 init enab dbg", EQUAL, client
- .getProperty(WBEMClientConstants.PROP_ENABLE_DEBUG), "0");
+ .getProperty(WBEMClientConstants.PROP_ENABLE_CONSOLE_LOGGING), "FINER");
verify("JSR48 init enab file", EQUAL, client
- .getProperty(WBEMClientConstants.PROP_ENABLE_FILE_LOGGING), "0");
+ .getProperty(WBEMClientConstants.PROP_ENABLE_FILE_LOGGING), "CONFIG");
verify("JSR48 init byte limit", EQUAL, client
.getProperty(WBEMClientConstants.PROP_LOG_BYTE_LIMIT), "8192");
verify("JSR48 init log dir", EQUAL, client.getProperty(WBEMClientConstants.PROP_LOG_DIR),
@@ -363,12 +355,10 @@
.getProperty(WBEMClientConstants.PROP_CLIENT_TRUSTSTORE), pathRelativeLong2);
// Setting corresponding JSR48 properties affect SBLIM properties
- verify("JSR48 init enab file from SBLIM", EQUAL, client
- .getProperty(WBEMConfigurationProperties.LOG_FILE_LEVEL), "OFF");
- verify("JSR48 init enab dbg from SBLIM", EQUAL, client
- .getProperty(WBEMConfigurationProperties.LOG_DEBUG), "false");
verify("JSR48 init enab con from SBLIM", EQUAL, client
- .getProperty(WBEMConfigurationProperties.LOG_CONSOLE_LEVEL), "ALL");
+ .getProperty(WBEMConfigurationProperties.LOG_CONSOLE_LEVEL), "FINER");
+ verify("JSR48 init enab file from SBLIM", EQUAL, client
+ .getProperty(WBEMConfigurationProperties.LOG_FILE_LEVEL), "CONFIG");
verify("JSR48 init byte limit from SBLIM", EQUAL, client
.getProperty(WBEMConfigurationProperties.LOG_FILE_SIZE_LIMIT), "8192");
verify("JSR48 init file loc from SBLIM", EQUAL, client
|
|
From: Dave B. <bla...@us...> - 2012-05-25 11:02:06
|
Update of /cvsroot/sblim/jsr48-client/src/javax/wbem/client In directory vz-cvs-3.sog:/tmp/cvs-serv23931/src/javax/wbem/client Modified Files: WBEMClient.java Log Message: 3525657 - Sync up javax.* javadoc with JSR48 1.0.0 Final III Index: WBEMClient.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/javax/wbem/client/WBEMClient.java,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- WBEMClient.java 9 May 2012 14:26:52 -0000 1.20 +++ WBEMClient.java 25 May 2012 11:02:02 -0000 1.21 @@ -30,6 +30,7 @@ * 3514537 2012-04-03 blaschke-oss TCK: execQueryInstances requires boolean, not Boolean * 3521131 2012-04-24 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final II * 3521328 2012-04-25 blaschke-oss JSR48 1.0.0: remove WBEMClient associators and references + * 3525657 2012-05-10 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final III */ package javax.wbem.client; @@ -1690,10 +1691,12 @@ * An array of property names used to specify which values from * the <code>CIMInstance</code> specified to set. Properties not * specified in this list but set in the <code>CIMInstance</code> - * specified are not modified. Duplicate and invalid property - * names are ignored and the request is otherwise processed - * normally. An empty array indicates that no properties should - * be modified. A <code>null</code> value indicates that all + * specified are not modified. Duplicate property names are + * ignored and the request is otherwise processed normally. If + * the <code>pPropertyList</code> contains invalid property names + * for the instance to be modified, the server shall reject the + * request. An empty array indicates that no properties should be + * modified. A <code>null</code> value indicates that all * properties should be modified. * @throws WBEMException * If unsuccessful, one of the following status codes must be |
|
From: Dave B. <bla...@us...> - 2012-05-25 11:02:05
|
Update of /cvsroot/sblim/jsr48-client In directory vz-cvs-3.sog:/tmp/cvs-serv23931 Modified Files: NEWS Log Message: 3525657 - Sync up javax.* javadoc with JSR48 1.0.0 Final III Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.300 retrieving revision 1.301 diff -u -d -r1.300 -r1.301 --- NEWS 23 May 2012 10:03:44 -0000 1.300 +++ NEWS 25 May 2012 11:02:01 -0000 1.301 @@ -1,5 +1,6 @@ Changes in HEAD ================ +3525657 Sync up javax.* javadoc with JSR48 1.0.0 Final III 3525150 Remove CIMGetClassOp.getPropertyLis 3525145 Remove CIMDeleteNameSpaceOp.getNamespace 3525138 Remove WBEMConstants.PROTOCOL_CIMXML |
|
From: Michael Chase-S. <mc...@us...> - 2012-05-24 22:15:43
|
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 53746007381cac413a0c123f855f0adb27eea90f (commit)
via 34799d5d358b2b4ea626ede3e8952f35b1d5f00d (commit)
from 0e2196798140db45b8f9f35aa3da636ae8f6153c (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 53746007381cac413a0c123f855f0adb27eea90f
Author: Michael Chase-Salerno <br...@li...>
Date: Thu May 24 18:15:03 2012 -0400
[ 3513390 ] Enforce LD and subscription limits
commit 34799d5d358b2b4ea626ede3e8952f35b1d5f00d
Author: Michael Chase-Salerno <br...@li...>
Date: Thu May 24 18:12:47 2012 -0400
[ 3513390 ] Enforce LD and subscription limits
-----------------------------------------------------------------------
Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 28a0d37..10b3db8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-23 Michael Chase-Salerno <br...@li...>
+
+ * control.h, indCIMXMLHandler.c, interopServerProvider.c,
+ test/TestProviders/tests/limitTest.sh:
+ [ 3513390 ] Enforce LD and subscription limits
+ Active Subscription limit, move LD check to interop
+
2012-05-21 Narasimha Sharoff <nsh...@us...>
* indCIMXMLExport.c, indCIMXMLHander.c:
diff --git a/indCIMXMLHandler.c b/indCIMXMLHandler.c
index 300c5a3..2250118 100644
--- a/indCIMXMLHandler.c
+++ b/indCIMXMLHandler.c
@@ -49,7 +49,6 @@ extern ExpSegments exportIndicationReq(CMPIInstance *ci, char *id);
extern void memLinkObjectPath(CMPIObjectPath * op);
static const CMPIBroker *_broker;
-static int LDcount=-1;
static int
interOpNameSpace(const CMPIObjectPath * cop, CMPIStatus *st)
@@ -392,15 +391,6 @@ IndCIMXMLHandlerCreateInstance(CMPIInstanceMI * mi,
if (CMClassPathIsA(_broker, copLocal, "cim_listenerdestination", NULL)) {
- // check destination count
- long cfgmax;
- getControlNum("MaxListenerDestinations", &cfgmax);
- if (LDcount+1 > cfgmax) {
- setStatus(&st,CMPI_RC_ERR_FAILED,"Instance creation would exceed MaxListenerDestinations limit");
- CMRelease(ciLocal);
- _SFCB_RETURN(st);
- }
-
//get the creation timestamp
struct timeval tv;
struct timezone tz;
@@ -431,7 +421,6 @@ IndCIMXMLHandlerCreateInstance(CMPIInstanceMI * mi,
CMSetProperty(ciLocal, "SequenceContext", &scontext, CMPI_string);
CMPIValue zarro = {.sint64 = -1 };
CMSetProperty(ciLocal, "LastSequenceNumber", &zarro, CMPI_sint64);
- LDcount++;
}
CMPIString *str = CDToString(_broker, copLocal, NULL);
@@ -533,7 +522,6 @@ IndCIMXMLHandlerDeleteInstance(CMPIInstanceMI * mi,
if (st.rc == CMPI_RC_OK) {
st = InternalProviderDeleteInstance(NULL, ctx, rslt, cop);
- LDcount--;
}
_SFCB_RETURN(st);
@@ -969,41 +957,6 @@ int refillRetryQ (const CMPIContext * ctx)
_SFCB_RETURN(0);
}
-
-int countLD (const CMPIContext * ctx) {
- _SFCB_ENTER(TRACE_INDPROVIDER, "countLD");
- CMPIEnumeration *enm;
- CMPIStatus st = { CMPI_RC_OK, NULL };
- LDcount++; // Mark it initialized
-
- // Enumerate the destinations
- CMPIContext * ctxLocal = prepareUpcall((CMPIContext *)ctx);
- CMPIObjectPath *ref=CMNewObjectPath(_broker,"root/interop","cim_listenerdestination",&st);
- enm = _broker->bft->enumerateInstanceNames(_broker, ctxLocal, ref, &st);
- while(enm && enm->ft->hasNext(enm, &st)) {
- LDcount++;
- enm->ft->getNext(enm, &st);
- }
- ref = CMNewObjectPath(_broker,"root/interop","cim_listenerdestinationcimxml",&st);
- enm = _broker->bft->enumerateInstanceNames(_broker, ctxLocal, ref, &st);
- while(enm && enm->ft->hasNext(enm, &st)) {
- LDcount++;
- enm->ft->getNext(enm, &st);
- }
- ref = CMNewObjectPath(_broker,"root/interop","cim_indicationhandlercimxml",&st);
- enm = _broker->bft->enumerateInstanceNames(_broker, ctxLocal, ref, &st);
- while(enm && enm->ft->hasNext(enm, &st)) {
- LDcount++;
- enm->ft->getNext(enm, &st);
- }
-
- CMRelease(ref);
- CMRelease(ctxLocal);
- _SFCB_TRACE(1,("--- initial count of destinations: %d.",LDcount));
-
- _SFCB_RETURN(0);
-}
-
int initIndCIMXML(const CMPIContext * ctx)
{
unsigned int ri;
@@ -1015,10 +968,6 @@ int initIndCIMXML(const CMPIContext * ctx)
//Refill the queue if there were any from the last run
refillRetryQ(ctx);
- if ( LDcount == -1 ) {
- //Get the count of ListenerDestinations
- countLD(ctx);
- }
_SFCB_RETURN(0);
}
diff --git a/interopProvider.c b/interopProvider.c
index c7545d0..f45b5ab 100644
--- a/interopProvider.c
+++ b/interopProvider.c
@@ -54,6 +54,11 @@ extern void setStatus(CMPIStatus *st, CMPIrc rc, char *msg);
extern int testNameSpace(char *ns, CMPIStatus *st);
extern void memLinkObjectPath(CMPIObjectPath * op);
+// Counts to enforce limits from cfg file
+static int LDcount=0;
+static int AScount=0;
+
+
/*
* -------------------------------------------------------------------------
*/
@@ -698,6 +703,24 @@ processSubscription(const CMPIBroker * broker,
setStatus(&st, CMPI_RC_ERR_NOT_FOUND, "Handler not found");
_SFCB_RETURN(st);
}
+ // Get current state
+ CMPIData d = CMGetProperty(ci, "SubscriptionState", &st);
+ if (d.state != CMPI_goodValue) {
+ // Not given, assume enable
+ val.uint16 = 2;
+ st = CMSetProperty((CMPIInstance*)ci, "SubscriptionState", &val, CMPI_uint16);
+ d.value.uint16=2;
+ }
+ if(d.value.uint16 == 2) {
+ // Check if we are hitting the max
+ long cfgmax;
+ getControlNum("MaxActiveSubscriptions", &cfgmax);
+ if (AScount+1 > cfgmax) {
+ setStatus(&st,CMPI_RC_ERR_FAILED,"Subscription activation would exceed MaxActiveSubscription limit");
+ return st;
+ }
+ AScount++;
+ }
_SFCB_TRACE(1, ("--- setting subscription start time"));
dt = CMNewDateTime(_broker, NULL);
@@ -715,18 +738,8 @@ processSubscription(const CMPIBroker * broker,
/* activation succesful, try to enable it */
if (st.rc == CMPI_RC_OK) {
/* only enable if state is 2 (default) */
- CMPIData d = CMGetProperty(ci, "SubscriptionState", &st);
- if(d.state == CMPI_goodValue) {
- if(d.value.uint16 == 2 && fi->useCount == 1) {
- fowardSubscription(ctx, fi, OPS_EnableIndications, &st);
- }
- } else {
- /* property not set, assume "enable" by default */
- val.uint16 = 2;
- st = CMSetProperty((CMPIInstance*)ci, "SubscriptionState", &val, CMPI_uint16);
- if (fi->useCount == 1) {
- fowardSubscription(ctx, fi, OPS_EnableIndications, &st);
- }
+ if(d.value.uint16 == 2 && fi->useCount == 1) {
+ fowardSubscription(ctx, fi, OPS_EnableIndications, &st);
}
}
@@ -1262,9 +1275,18 @@ InteropProviderModifyInstance(CMPIInstanceMI * mi,
if (newState.state == CMPI_goodValue) {
if (newState.value.uint16 == 2 && oldState.value.uint16 != 2) {
+ // Check if we've hit the max before we actvate
+ long cfgmax;
+ getControlNum("MaxActiveSubscriptions", &cfgmax);
+ if (AScount+1 > cfgmax) {
+ setStatus(&st,CMPI_RC_ERR_FAILED,"Subscription activation would exceed MaxActiveSubscription limit");
+ return st;
+ }
switchIndications(ctx, ci, OPS_EnableIndications);
+ AScount++;
} else if (newState.value.uint16 == 4 && oldState.value.uint16 != 4) {
switchIndications(ctx, ci, OPS_DisableIndications);
+ AScount--;
}
}
/*
@@ -1342,6 +1364,19 @@ InteropProviderDeleteInstance(CMPIInstanceMI * mi,
OPS_DeactivateFilter, NULL);
}
}
+ // get current state
+ ctxLocal = prepareUpcall((CMPIContext *)ctx);
+ CMPIInstance *ci = _broker->bft->getInstance(_broker, ctxLocal, cop, NULL, NULL);
+ CMRelease(ctxLocal);
+ CMPIData d = CMGetProperty(ci, "SubscriptionState", &st);
+ if (d.state != CMPI_goodValue) {
+ // Not given, assume enable
+ d.value.uint16=2;
+ }
+ if(d.value.uint16 == 2) {
+ // If this is an active sub, decrement the count
+ AScount--;
+ }
removeSubscription(su, key);
} else
setStatus(&st, CMPI_RC_ERR_NOT_FOUND, NULL);
@@ -1531,6 +1566,15 @@ InteropProviderInvokeMethod(CMPIMethodMI * mi,
}
else if (strcasecmp(methodName, "_addHandler") == 0) {
+ // check destination count
+ long cfgmax;
+ getControlNum("MaxListenerDestinations", &cfgmax);
+ if (LDcount+1 > cfgmax) {
+ setStatus(&st,CMPI_RC_ERR_FAILED,"Instance creation would exceed MaxListenerDestinations limit");
+ _SFCB_RETURN(st);
+ }
+ LDcount++;
+
CMPIInstance *ci = in->ft->getArg(in, "handler", &st).value.inst;
CMPIObjectPath *op = in->ft->getArg(in, "key", &st).value.ref;
CMPIString *str = CDToString(_broker, op, NULL);
@@ -1550,6 +1594,7 @@ InteropProviderInvokeMethod(CMPIMethodMI * mi,
setStatus(&st, CMPI_RC_ERR_FAILED, "Handler in use");
} else
removeHandler(ha, key);
+ LDcount--;
} else {
setStatus(&st, CMPI_RC_ERR_NOT_FOUND, "Handler object not found");
}
diff --git a/test/TestProviders/tests/limitTest.sh b/test/TestProviders/tests/limitTest.sh
index 9526f4a..22f6c16 100755
--- a/test/TestProviders/tests/limitTest.sh
+++ b/test/TestProviders/tests/limitTest.sh
@@ -43,7 +43,76 @@ sendxml () {
cleanup () {
# Cleans up all created instances
- CLPRE='<?xml version="1.0" encoding="utf-8"?>
+ CLSPRE='<?xml version="1.0" encoding="utf-8"?>
+<CIM CIMVERSION="2.0" DTDVERSION="2.0">
+ <MESSAGE ID="4711" PROTOCOLVERSION="1.0">
+ <SIMPLEREQ>
+ <IMETHODCALL NAME="DeleteInstance">
+ <LOCALNAMESPACEPATH>
+ <NAMESPACE NAME="root"/>
+ <NAMESPACE NAME="interop"/>
+ </LOCALNAMESPACEPATH>
+ <IPARAMVALUE NAME="InstanceName">
+ <INSTANCENAME CLASSNAME="CIM_IndicationSubscription">
+ <KEYBINDING NAME="Filter">
+ <VALUE.REFERENCE>
+ <INSTANCENAME CLASSNAME="CIM_IndicationFilter">
+ <KEYBINDING NAME="SystemCreationClassName">
+ <KEYVALUE VALUETYPE="string">
+ CIM_ComputerSystem
+ </KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="SystemName">
+ <KEYVALUE VALUETYPE="string">
+ localhost.localdomain
+ </KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="CreationClassName">
+ <KEYVALUE VALUETYPE="string">
+ CIM_IndicationFilter
+ </KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="Name">
+ <KEYVALUE VALUETYPE="string">
+ Test_Indication_Filter_
+ </KEYVALUE>
+ </KEYBINDING>
+ </INSTANCENAME>
+ </VALUE.REFERENCE>
+ </KEYBINDING>
+ <KEYBINDING NAME="Handler">
+ <VALUE.REFERENCE>
+ <INSTANCENAME CLASSNAME="CIM_IndicationHandlerCIMXML">
+ <KEYBINDING NAME="SystemCreationClassName">
+ <KEYVALUE VALUETYPE="string">
+ CIM_ComputerSystem
+ </KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="SystemName">
+ <KEYVALUE VALUETYPE="string">
+ localhost.localdomain
+ </KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="CreationClassName">
+ <KEYVALUE VALUETYPE="string">
+ CIM_IndicationHandlerCIMXML
+ </KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="Name">
+ <KEYVALUE VALUETYPE="string">'
+ CLSPOST=' </KEYVALUE>
+ </KEYBINDING>
+ </INSTANCENAME>
+ </VALUE.REFERENCE>
+ </KEYBINDING>
+ </INSTANCENAME>
+ </IPARAMVALUE>
+ </IMETHODCALL>
+ </SIMPLEREQ>
+ </MESSAGE>
+</CIM>'
+
+ CLDPRE='<?xml version="1.0" encoding="utf-8"?>
<CIM CIMVERSION="2.0" DTDVERSION="2.0">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0">
<SIMPLEREQ>
@@ -65,7 +134,7 @@ cleanup () {
</KEYBINDING>
<KEYBINDING NAME="Name">
<KEYVALUE>'
- CLPOST='</KEYVALUE>
+ CLDPOST='</KEYVALUE>
</KEYBINDING>
</INSTANCENAME>
</IPARAMVALUE>
@@ -77,17 +146,25 @@ cleanup () {
j=1
while [ $j -le $lim ]
do
- XML=$CLPRE"limitTest_"$j$CLPOST
+ XML=$CLSPRE"limitTest_"$j$CLSPOST
+ echo $XML > ./limitTest.xml
+ sendxml ./limitTest.xml /dev/null
+ XML=$CLDPRE"limitTest_"$j$CLDPOST
echo $XML > ./limitTest.xml
sendxml ./limitTest.xml /dev/null
j=$((j+1))
done
- XML=$CLPRE"limitTest_final"$CLPOST
+ XML=$CLSPRE"limitTest_final"$CLSPOST
+ echo $XML > ./limitTest.xml
+ sendxml ./limitTest.xml /dev/null
+ XML=$CLDPRE"limitTest_final"$CLDPOST
echo $XML > ./limitTest.xml
sendxml ./limitTest.xml /dev/null
rm ./limitTest.xml
rm ./limitTest.result
+ wbemcat IndTest7DeleteFilter.xml > /dev/null
+ wbemcat limitTestDF2.XML > /dev/null
}
# Start of main
@@ -138,7 +215,7 @@ POST='</VALUE>
# Create 100 Listener Destinations
j=1
-echo -n " Testing LD limit ..."
+echo -n " Testing LD limit "
while [ $j -le $lim ]
do
# Use "limitTest_xxx" as the name
@@ -159,7 +236,9 @@ do
# some reason. Might be ok, so just flag it
# and continue. It's possible other instances
# existed before the test was run.
- echo -n " Create $j failed ... continuing ..."
+ echo -n "X"
+ else
+ echo -n "."
fi
j=$((j+1))
done
@@ -179,6 +258,167 @@ then
exit 1;
fi
echo " PASSED"
-cleanup
+#
+# Now check for active subscriptions
+#
+
+PRE='<?xml version="1.0" encoding="utf-8"?>
+<CIM CIMVERSION="2.0" DTDVERSION="2.0">
+ <MESSAGE ID="4711" PROTOCOLVERSION="1.0">
+ <SIMPLEREQ>
+ <IMETHODCALL NAME="CreateInstance">
+ <LOCALNAMESPACEPATH>
+ <NAMESPACE NAME="root"/>
+ <NAMESPACE NAME="interop"/>
+ </LOCALNAMESPACEPATH>
+ <IPARAMVALUE NAME="NewInstance">
+ <INSTANCE CLASSNAME="CIM_IndicationSubscription">
+ <PROPERTY.REFERENCE NAME="Filter"
+ REFERENCECLASS="CIM_IndicationFilter">
+ <VALUE.REFERENCE>
+ <INSTANCENAME CLASSNAME="CIM_IndicationFilter">
+ <KEYBINDING NAME="SystemCreationClassName">
+ <KEYVALUE VALUETYPE="string">
+ CIM_ComputerSystem
+ </KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="SystemName">
+ <KEYVALUE VALUETYPE="string">
+ localhost.localdomain
+ </KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="CreationClassName">
+ <KEYVALUE VALUETYPE="string">
+ CIM_IndicationFilter
+ </KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="Name">
+ <KEYVALUE VALUETYPE="string">'
+MID='
+ </KEYVALUE>
+ </KEYBINDING>
+ </INSTANCENAME>
+ </VALUE.REFERENCE>
+ </PROPERTY.REFERENCE>
+ <PROPERTY.REFERENCE NAME="Handler"
+ REFERENCECLASS="CIM_IndicationHandler">
+ <VALUE.REFERENCE>
+ <INSTANCENAME CLASSNAME="CIM_IndicationHandlerCIMXML">
+ <KEYBINDING NAME="SystemCreationClassName">
+ <KEYVALUE VALUETYPE="string">
+ CIM_ComputerSystem
+ </KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="SystemName">
+ <KEYVALUE VALUETYPE="string">
+ localhost.localdomain
+ </KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="CreationClassName">
+ <KEYVALUE VALUETYPE="string">
+ CIM_IndicationHandlerCIMXML
+ </KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="Name">
+ <KEYVALUE VALUETYPE="string">'
+
+POST='</KEYVALUE>
+ </KEYBINDING>
+ </INSTANCENAME>
+ </VALUE.REFERENCE>
+ </PROPERTY.REFERENCE>
+ <PROPERTY NAME="SubscriptionState" TYPE="uint16">
+ <VALUE> 2 </VALUE>
+ </PROPERTY>
+ </INSTANCE>
+ </IPARAMVALUE>
+ </IMETHODCALL>
+ </SIMPLEREQ>
+ </MESSAGE>
+</CIM>'
+
+POSTD='</KEYVALUE>
+ </KEYBINDING>
+ </INSTANCENAME>
+ </VALUE.REFERENCE>
+ </PROPERTY.REFERENCE>
+ <PROPERTY NAME="SubscriptionState" TYPE="uint16">
+ <VALUE> 1 </VALUE>
+ </PROPERTY>
+ </INSTANCE>
+ </IPARAMVALUE>
+ </IMETHODCALL>
+ </SIMPLEREQ>
+ </MESSAGE>
+</CIM>'
+
+# Create 100 subs
+lim=100
+j=1
+wbemcat IndTest1CreateFilter.xml > /dev/null
+wbemcat limitTestCF2.XML > /dev/null
+echo -n " Testing Sub limit "
+while [ $j -le $lim ]
+do
+ XML=$PRE"Test_Indication_Filter_"$MID"limitTest_"$j$POST
+ echo $XML > ./limitTest.xml
+ sendxml ./limitTest.xml limitTest.result
+ if [ $? -ne 0 ]
+ then
+ echo " Create $j FAILED"
+ cleanup
+ exit 1;
+ fi
+ grep "limitTest" ./limitTest.result >/dev/null 2>&1
+ if [ $? -ne 0 ]
+ then
+ # This means one of the early creates failed for
+ # some reason. Might be ok, so just flag it
+ # and continue. It's possible other instances
+ # existed before the test was run.
+ echo -n "X"
+ else
+ echo -n "."
+ fi
+ j=$((j+1))
+done
+
+# Make sure the final one fails
+XML=$PRE"limitTest_f2"$MID"limitTest_1"$POST
+echo $XML > ./limitTest.xml
+sendxml ./limitTest.xml ./limit.result
+wbemcat limitTestDS2.XML > /dev/null
+grep "limitTest" ./limit.result >/dev/null 2>&1
+if [ $? -eq 0 ]
+then
+ echo " limit not enforced. FAILED"
+ cleanup
+ exit 1;
+fi
+
+# Should be able to create a disabled one
+XML=$PRE"limitTest_f2"$MID"limitTest_1"$POSTD
+echo $XML > ./limitTest.xml
+sendxml ./limitTest.xml ./limit.result
+grep "limitTest" ./limit.result >/dev/null 2>&1
+if [ $? -ne 0 ]
+then
+ echo " disabled subscription prevented. FAILED"
+ cleanup
+ exit 1;
+fi
+# but we shouldn't be able to activate it.
+wbemcat limitTestEnableSub.XML > ./limit.result
+wbemcat limitTestDS2.XML > /dev/null
+grep "MaxActiveSubscription" ./limit.result >/dev/null 2>&1
+if [ $? -ne 0 ]
+then
+ echo " enable subscription limit not enforced. FAILED"
+ cleanup
+ exit 1;
+fi
+
+echo " PASSED"
+cleanup
exit 0
diff --git a/test/TestProviders/tests/IndTest1CreateFilter.xml b/test/TestProviders/tests/limitTestCF2.XML
similarity index 96%
copy from test/TestProviders/tests/IndTest1CreateFilter.xml
copy to test/TestProviders/tests/limitTestCF2.XML
index d8273d9..fb97d8d 100644
--- a/test/TestProviders/tests/IndTest1CreateFilter.xml
+++ b/test/TestProviders/tests/limitTestCF2.XML
@@ -20,7 +20,7 @@
</PROPERTY>
<PROPERTY NAME="Name" TYPE="string">
- <VALUE>Test_Indication_Filter_</VALUE>
+ <VALUE>limitTest_f2</VALUE>
</PROPERTY>
<PROPERTY NAME="Query" TYPE="string">
<VALUE> SELECT * FROM Test_Indication
diff --git a/test/TestProviders/tests/IndTest7DeleteFilter.xml b/test/TestProviders/tests/limitTestDF2.XML
similarity index 94%
copy from test/TestProviders/tests/IndTest7DeleteFilter.xml
copy to test/TestProviders/tests/limitTestDF2.XML
index 6b434d8..2916f15 100644
--- a/test/TestProviders/tests/IndTest7DeleteFilter.xml
+++ b/test/TestProviders/tests/limitTestDF2.XML
@@ -19,7 +19,7 @@
<KEYVALUE>CIM_IndicationFilter</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Name">
- <KEYVALUE>Test_Indication_Filter_</KEYVALUE>
+ <KEYVALUE>limitTest_f2</KEYVALUE>
</KEYBINDING>
</INSTANCENAME>
</IPARAMVALUE>
diff --git a/test/TestProviders/tests/IndTest5DeleteSubscription.xml b/test/TestProviders/tests/limitTestDS2.XML
similarity index 96%
copy from test/TestProviders/tests/IndTest5DeleteSubscription.xml
copy to test/TestProviders/tests/limitTestDS2.XML
index 302927b..ee0a2ed 100644
--- a/test/TestProviders/tests/IndTest5DeleteSubscription.xml
+++ b/test/TestProviders/tests/limitTestDS2.XML
@@ -29,7 +29,7 @@
</KEYBINDING>
<KEYBINDING NAME="Name">
<KEYVALUE VALUETYPE="string">
- Test_Indication_Filter_
+ limitTest_f2
</KEYVALUE>
</KEYBINDING>
</INSTANCENAME>
@@ -55,7 +55,7 @@
</KEYBINDING>
<KEYBINDING NAME="Name">
<KEYVALUE VALUETYPE="string">
- Test_Indication_Handler_
+ limitTest_1
</KEYVALUE>
</KEYBINDING>
</INSTANCENAME>
diff --git a/test/TestProviders/tests/limitTestEnableSub.XML b/test/TestProviders/tests/limitTestEnableSub.XML
new file mode 100644
index 0000000..b5ecbe2
--- /dev/null
+++ b/test/TestProviders/tests/limitTestEnableSub.XML
@@ -0,0 +1,67 @@
+ <?xml version="1.0" encoding="utf-8" ?>
+ <CIM CIMVERSION="2.0" DTDVERSION="2.0">
+ <MESSAGE ID="4711" PROTOCOLVERSION="1.0"><SIMPLEREQ><IMETHODCALL NAME="ModifyInstance"><LOCALNAMESPACEPATH><NAMESPACE NAME="root"></NAMESPACE><NAMESPACE NAME="interop"></NAMESPACE></LOCALNAMESPACEPATH>
+ <IPARAMVALUE NAME="ModifiedInstance"><VALUE.NAMEDINSTANCE><INSTANCENAME CLASSNAME="cim_indicationsubscription"><KEYBINDING NAME="filter"><VALUE.REFERENCE><INSTANCEPATH><NAMESPACEPATH><HOST>localhost</HOST><LOCALNAMESPACEPATH><NAMESPACE NAME="root"></NAMESPACE><NAMESPACE NAME="interop"></NAMESPACE></LOCALNAMESPACEPATH></NAMESPACEPATH><INSTANCENAME CLASSNAME="cim_indicationfilter"><KEYBINDING NAME="creationclassname"><KEYVALUE VALUETYPE="string">CIM_IndicationFilter</KEYVALUE></KEYBINDING><KEYBINDING NAME="name"><KEYVALUE VALUETYPE="string">limitTest_f2</KEYVALUE></KEYBINDING><KEYBINDING NAME="systemcreationclassname"><KEYVALUE VALUETYPE="string">CIM_ComputerSystem</KEYVALUE></KEYBINDING><KEYBINDING NAME="systemname"><KEYVALUE VALUETYPE="string">localhost.localdomain</KEYVALUE></KEYBINDING></INSTANCENAME></INSTANCEPATH></VALUE.REFERENCE></KEYBINDING><KEYBINDING NAME="handler"><VALUE.REFERENCE><INSTANCEPATH><NAMESPACEPATH><HOST>localhost</HOST><LOCALNAMESPACEPATH><NAMESPACE NAME="root"></NAMESPACE><NAMESPACE NAME="interop"></NAMESPACE></LOCALNAMESPACEPATH></NAMESPACEPATH><INSTANCENAME CLASSNAME="cim_indicationhandlercimxml"><KEYBINDING NAME="creationclassname"><KEYVALUE VALUETYPE="string">CIM_IndicationHandlerCIMXML</KEYVALUE></KEYBINDING><KEYBINDING NAME="name"><KEYVALUE VALUETYPE="string">limitTest_1</KEYVALUE></KEYBINDING><KEYBINDING NAME="systemcreationclassname"><KEYVALUE VALUETYPE="string">CIM_ComputerSystem</KEYVALUE></KEYBINDING><KEYBINDING NAME="systemname"><KEYVALUE VALUETYPE="string">localhost.localdomain</KEYVALUE></KEYBINDING></INSTANCENAME></INSTANCEPATH></VALUE.REFERENCE></KEYBINDING></INSTANCENAME><INSTANCE CLASSNAME="cim_indicationsubscription"><PROPERTY.REFERENCE NAME="Handler">
+ <VALUE.REFERENCE>
+ <LOCALINSTANCEPATH>
+ <LOCALNAMESPACEPATH>
+ <NAMESPACE NAME="root"/>
+ <NAMESPACE NAME="interop"/>
+ </LOCALNAMESPACEPATH>
+ <INSTANCENAME CLASSNAME="CIM_IndicationHandlerCIMXML">
+ <KEYBINDING NAME="SystemCreationClassName">
+ <KEYVALUE VALUETYPE="string">CIM_ComputerSystem</KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="SystemName">
+ <KEYVALUE VALUETYPE="string">localhost.localdomain</KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="CreationClassName">
+ <KEYVALUE VALUETYPE="string">CIM_IndicationHandlerCIMXML</KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="Name">
+ <KEYVALUE VALUETYPE="string">limitTest_1</KEYVALUE>
+ </KEYBINDING>
+ </INSTANCENAME>
+ </LOCALINSTANCEPATH>
+ </VALUE.REFERENCE>
+ </PROPERTY.REFERENCE><PROPERTY.REFERENCE NAME="Filter">
+ <VALUE.REFERENCE>
+ <LOCALINSTANCEPATH>
+ <LOCALNAMESPACEPATH>
+ <NAMESPACE NAME="root"/>
+ <NAMESPACE NAME="interop"/>
+ </LOCALNAMESPACEPATH>
+ <INSTANCENAME CLASSNAME="CIM_IndicationFilter">
+ <KEYBINDING NAME="SystemCreationClassName">
+ <KEYVALUE VALUETYPE="string">CIM_ComputerSystem</KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="SystemName">
+ <KEYVALUE VALUETYPE="string">localhost.localdomain</KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="CreationClassName">
+ <KEYVALUE VALUETYPE="string">CIM_IndicationFilter</KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="Name">
+ <KEYVALUE VALUETYPE="string">limitTest_f2</KEYVALUE>
+ </KEYBINDING>
+ </INSTANCENAME>
+ </LOCALINSTANCEPATH>
+ </VALUE.REFERENCE>
+ </PROPERTY.REFERENCE><PROPERTY NAME="OnFatalErrorPolicy" TYPE="uint16">
+ </PROPERTY><PROPERTY NAME="OtherOnFatalErrorPolicy" TYPE="string">
+ </PROPERTY><PROPERTY NAME="FailureTriggerTimeInterval" TYPE="uint64">
+ </PROPERTY>
+ <PROPERTY NAME="SubscriptionState" TYPE="uint16"><VALUE>2</VALUE></PROPERTY><PROPERTY NAME="OtherSubscriptionState" TYPE="string">
+ </PROPERTY><PROPERTY NAME="TimeOfLastStateChange" TYPE="datetime">
+ </PROPERTY><PROPERTY NAME="SubscriptionDuration" TYPE="uint64">
+ </PROPERTY><PROPERTY NAME="SubscriptionStartTime" TYPE="datetime">
+ <VALUE>20120522154444.655395-240</VALUE>
+ </PROPERTY><PROPERTY NAME="SubscriptionTimeRemaining" TYPE="uint64">
+ </PROPERTY><PROPERTY NAME="RepeatNotificationPolicy" TYPE="uint16">
+ </PROPERTY><PROPERTY NAME="OtherRepeatNotificationPolicy" TYPE="string">
+ </PROPERTY><PROPERTY NAME="RepeatNotificationInterval" TYPE="uint64">
+ </PROPERTY><PROPERTY NAME="RepeatNotificationGap" TYPE="uint64">
+ </PROPERTY><PROPERTY NAME="RepeatNotificationCount" TYPE="uint16">
+ </PROPERTY></INSTANCE></VALUE.NAMEDINSTANCE></IPARAMVALUE>
+ </IMETHODCALL></SIMPLEREQ>
+ </MESSAGE></CIM>
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Michael Chase-S. <mc...@us...> - 2012-05-24 21:03:16
|
Update of /cvsroot/sblim/sfcb/test/TestProviders/tests
In directory vz-cvs-3.sog:/tmp/cvs-serv16093
Modified Files:
limitTest.sh
Added Files:
limitTestDF2.XML
Log Message:
3513390 - Enforce LD and subscription limits
Missing test file
Index: limitTest.sh
===================================================================
RCS file: /cvsroot/sblim/sfcb/test/TestProviders/tests/limitTest.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- limitTest.sh 23 May 2012 21:58:55 -0000 1.2
+++ limitTest.sh 24 May 2012 21:03:13 -0000 1.3
@@ -164,7 +164,7 @@
rm ./limitTest.xml
rm ./limitTest.result
wbemcat IndTest7DeleteFilter.xml > /dev/null
- wbemcat limitTestDF2.xml > /dev/null
+ wbemcat limitTestDF2.XML > /dev/null
}
# Start of main
--- NEW FILE: limitTestDF2.XML ---
<?xml version="1.0" encoding="utf-8"?>
<CIM CIMVERSION="2.0" DTDVERSION="2.0">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0">
<SIMPLEREQ>
<IMETHODCALL NAME="DeleteInstance">
<LOCALNAMESPACEPATH>
<NAMESPACE NAME="root"/>
<NAMESPACE NAME="interop"/>
</LOCALNAMESPACEPATH>
<IPARAMVALUE NAME="InstanceName">
<INSTANCENAME CLASSNAME="CIM_IndicationFilter">
<KEYBINDING NAME="SystemCreationClassName">
<KEYVALUE>CIM_ComputerSystem</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="SystemName">
<KEYVALUE>localhost.localdomain</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="CreationClassName">
<KEYVALUE>CIM_IndicationFilter</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Name">
<KEYVALUE>limitTest_f2</KEYVALUE>
</KEYBINDING>
</INSTANCENAME>
</IPARAMVALUE>
</IMETHODCALL>
</SIMPLEREQ>
</MESSAGE>
</CIM>
|
|
From: Michael Chase-S. <mc...@us...> - 2012-05-23 21:58:57
|
Update of /cvsroot/sblim/sfcb/test/TestProviders/tests
In directory vz-cvs-3.sog:/tmp/cvs-serv22257/test/TestProviders/tests
Modified Files:
limitTest.sh
Added Files:
limitTestCF2.XML limitTestDS2.XML limitTestEnableSub.XML
Log Message:
3513390 - Enforce LD and subscription limits
Active sub limit, move LD limits to interop
--- NEW FILE: limitTestEnableSub.XML ---
<?xml version="1.0" encoding="utf-8" ?>
<CIM CIMVERSION="2.0" DTDVERSION="2.0">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0"><SIMPLEREQ><IMETHODCALL NAME="ModifyInstance"><LOCALNAMESPACEPATH><NAMESPACE NAME="root"></NAMESPACE><NAMESPACE NAME="interop"></NAMESPACE></LOCALNAMESPACEPATH>
<IPARAMVALUE NAME="ModifiedInstance"><VALUE.NAMEDINSTANCE><INSTANCENAME CLASSNAME="cim_indicationsubscription"><KEYBINDING NAME="filter"><VALUE.REFERENCE><INSTANCEPATH><NAMESPACEPATH><HOST>localhost</HOST><LOCALNAMESPACEPATH><NAMESPACE NAME="root"></NAMESPACE><NAMESPACE NAME="interop"></NAMESPACE></LOCALNAMESPACEPATH></NAMESPACEPATH><INSTANCENAME CLASSNAME="cim_indicationfilter"><KEYBINDING NAME="creationclassname"><KEYVALUE VALUETYPE="string">CIM_IndicationFilter</KEYVALUE></KEYBINDING><KEYBINDING NAME="name"><KEYVALUE VALUETYPE="string">limitTest_f2</KEYVALUE></KEYBINDING><KEYBINDING NAME="systemcreationclassname"><KEYVALUE VALUETYPE="string">CIM_ComputerSystem</KEYVALUE></KEYBINDING><KEYBINDING NAME="systemname"><KEYVALUE VALUETYPE="string">localhost.localdomain</KEYVALUE></KEYBINDING></INSTANCENAME></INSTANCEPATH></VALUE.REFERENCE></KEYBINDING><KEYBINDING NAME="handler"><VALUE.REFERENCE><INSTANCEPATH><NAMESPACEPATH><HOST>localhost</HOST><LOCALNAMESPACEPATH><NAMESPACE NAME="root"></NAMESPACE><NAMESPACE NAME="interop"></NAMESPACE></LOCALNAMESPACEPATH></NAMESPACEPATH><INSTANCENAME CLASSNAME="cim_indicationhandlercimxml"><KEYBINDING NAME="creationclassname"><KEYVALUE VALUETYPE="string">CIM_IndicationHandlerCIMXML</KEYVALUE></KEYBINDING><KEYBINDING NAME="name"><KEYVALUE VALUETYPE="string">limitTest_1</KEYVALUE></KEYBINDING><KEYBINDING NAME="systemcreationclassname"><KEYVALUE VALUETYPE="string">CIM_ComputerSystem</KEYVALUE></KEYBINDING><KEYBINDING NAME="systemname"><KEYVALUE VALUETYPE="string">localhost.localdomain</KEYVALUE></KEYBINDING></INSTANCENAME></INSTANCEPATH></VALUE.REFERENCE></KEYBINDING></INSTANCENAME><INSTANCE CLASSNAME="cim_indicationsubscription"><PROPERTY.REFERENCE NAME="Handler">
<VALUE.REFERENCE>
<LOCALINSTANCEPATH>
<LOCALNAMESPACEPATH>
<NAMESPACE NAME="root"/>
<NAMESPACE NAME="interop"/>
</LOCALNAMESPACEPATH>
<INSTANCENAME CLASSNAME="CIM_IndicationHandlerCIMXML">
<KEYBINDING NAME="SystemCreationClassName">
<KEYVALUE VALUETYPE="string">CIM_ComputerSystem</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="SystemName">
<KEYVALUE VALUETYPE="string">localhost.localdomain</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="CreationClassName">
<KEYVALUE VALUETYPE="string">CIM_IndicationHandlerCIMXML</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Name">
<KEYVALUE VALUETYPE="string">limitTest_1</KEYVALUE>
</KEYBINDING>
</INSTANCENAME>
</LOCALINSTANCEPATH>
</VALUE.REFERENCE>
</PROPERTY.REFERENCE><PROPERTY.REFERENCE NAME="Filter">
<VALUE.REFERENCE>
<LOCALINSTANCEPATH>
<LOCALNAMESPACEPATH>
<NAMESPACE NAME="root"/>
<NAMESPACE NAME="interop"/>
</LOCALNAMESPACEPATH>
<INSTANCENAME CLASSNAME="CIM_IndicationFilter">
<KEYBINDING NAME="SystemCreationClassName">
<KEYVALUE VALUETYPE="string">CIM_ComputerSystem</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="SystemName">
<KEYVALUE VALUETYPE="string">localhost.localdomain</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="CreationClassName">
<KEYVALUE VALUETYPE="string">CIM_IndicationFilter</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Name">
<KEYVALUE VALUETYPE="string">limitTest_f2</KEYVALUE>
</KEYBINDING>
</INSTANCENAME>
</LOCALINSTANCEPATH>
</VALUE.REFERENCE>
</PROPERTY.REFERENCE><PROPERTY NAME="OnFatalErrorPolicy" TYPE="uint16">
</PROPERTY><PROPERTY NAME="OtherOnFatalErrorPolicy" TYPE="string">
</PROPERTY><PROPERTY NAME="FailureTriggerTimeInterval" TYPE="uint64">
</PROPERTY>
<PROPERTY NAME="SubscriptionState" TYPE="uint16"><VALUE>2</VALUE></PROPERTY><PROPERTY NAME="OtherSubscriptionState" TYPE="string">
</PROPERTY><PROPERTY NAME="TimeOfLastStateChange" TYPE="datetime">
</PROPERTY><PROPERTY NAME="SubscriptionDuration" TYPE="uint64">
</PROPERTY><PROPERTY NAME="SubscriptionStartTime" TYPE="datetime">
<VALUE>20120522154444.655395-240</VALUE>
</PROPERTY><PROPERTY NAME="SubscriptionTimeRemaining" TYPE="uint64">
</PROPERTY><PROPERTY NAME="RepeatNotificationPolicy" TYPE="uint16">
</PROPERTY><PROPERTY NAME="OtherRepeatNotificationPolicy" TYPE="string">
</PROPERTY><PROPERTY NAME="RepeatNotificationInterval" TYPE="uint64">
</PROPERTY><PROPERTY NAME="RepeatNotificationGap" TYPE="uint64">
</PROPERTY><PROPERTY NAME="RepeatNotificationCount" TYPE="uint16">
</PROPERTY></INSTANCE></VALUE.NAMEDINSTANCE></IPARAMVALUE>
</IMETHODCALL></SIMPLEREQ>
</MESSAGE></CIM>
--- NEW FILE: limitTestCF2.XML ---
<?xml version="1.0" encoding="utf-8"?>
<CIM CIMVERSION="2.0" DTDVERSION="2.0">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0">
<SIMPLEREQ>
<IMETHODCALL NAME="CreateInstance">
<LOCALNAMESPACEPATH>
<NAMESPACE NAME="root"/>
<NAMESPACE NAME="interop"/>
</LOCALNAMESPACEPATH>
<IPARAMVALUE NAME="NewInstance">
<INSTANCE CLASSNAME="CIM_IndicationFilter">
<PROPERTY NAME="SystemName" TYPE="string">
<VALUE>localhost.localdomain</VALUE>
</PROPERTY>
<PROPERTY NAME="SystemCreationClassName" TYPE="string">
<VALUE>CIM_ComputerSystem</VALUE>
</PROPERTY>
<PROPERTY NAME="CreationClassName" TYPE="string">
<VALUE>CIM_IndicationFilter</VALUE>
</PROPERTY>
<PROPERTY NAME="Name" TYPE="string">
<VALUE>limitTest_f2</VALUE>
</PROPERTY>
<PROPERTY NAME="Query" TYPE="string">
<VALUE> SELECT * FROM Test_Indication
</VALUE>
</PROPERTY>
<PROPERTY NAME="QueryLanguage" TYPE="string">
<VALUE>WQL</VALUE>
</PROPERTY>
<PROPERTY NAME="SourceNamespace" TYPE="string">
<VALUE>root/interop</VALUE>
</PROPERTY>
</INSTANCE>
</IPARAMVALUE>
</IMETHODCALL>
</SIMPLEREQ>
</MESSAGE>
</CIM>
Index: limitTest.sh
===================================================================
RCS file: /cvsroot/sblim/sfcb/test/TestProviders/tests/limitTest.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- limitTest.sh 19 Apr 2012 17:39:55 -0000 1.1
+++ limitTest.sh 23 May 2012 21:58:55 -0000 1.2
@@ -43,7 +43,76 @@
cleanup () {
# Cleans up all created instances
- CLPRE='<?xml version="1.0" encoding="utf-8"?>
+ CLSPRE='<?xml version="1.0" encoding="utf-8"?>
+<CIM CIMVERSION="2.0" DTDVERSION="2.0">
+ <MESSAGE ID="4711" PROTOCOLVERSION="1.0">
+ <SIMPLEREQ>
+ <IMETHODCALL NAME="DeleteInstance">
+ <LOCALNAMESPACEPATH>
+ <NAMESPACE NAME="root"/>
+ <NAMESPACE NAME="interop"/>
+ </LOCALNAMESPACEPATH>
+ <IPARAMVALUE NAME="InstanceName">
+ <INSTANCENAME CLASSNAME="CIM_IndicationSubscription">
+ <KEYBINDING NAME="Filter">
+ <VALUE.REFERENCE>
+ <INSTANCENAME CLASSNAME="CIM_IndicationFilter">
+ <KEYBINDING NAME="SystemCreationClassName">
+ <KEYVALUE VALUETYPE="string">
+ CIM_ComputerSystem
+ </KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="SystemName">
+ <KEYVALUE VALUETYPE="string">
+ localhost.localdomain
+ </KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="CreationClassName">
+ <KEYVALUE VALUETYPE="string">
+ CIM_IndicationFilter
+ </KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="Name">
+ <KEYVALUE VALUETYPE="string">
+ Test_Indication_Filter_
+ </KEYVALUE>
+ </KEYBINDING>
+ </INSTANCENAME>
+ </VALUE.REFERENCE>
+ </KEYBINDING>
+ <KEYBINDING NAME="Handler">
+ <VALUE.REFERENCE>
+ <INSTANCENAME CLASSNAME="CIM_IndicationHandlerCIMXML">
+ <KEYBINDING NAME="SystemCreationClassName">
+ <KEYVALUE VALUETYPE="string">
+ CIM_ComputerSystem
+ </KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="SystemName">
+ <KEYVALUE VALUETYPE="string">
+ localhost.localdomain
+ </KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="CreationClassName">
+ <KEYVALUE VALUETYPE="string">
+ CIM_IndicationHandlerCIMXML
+ </KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="Name">
+ <KEYVALUE VALUETYPE="string">'
+ CLSPOST=' </KEYVALUE>
+ </KEYBINDING>
+ </INSTANCENAME>
+ </VALUE.REFERENCE>
+ </KEYBINDING>
+ </INSTANCENAME>
+ </IPARAMVALUE>
+ </IMETHODCALL>
+ </SIMPLEREQ>
+ </MESSAGE>
+</CIM>'
+
+ CLDPRE='<?xml version="1.0" encoding="utf-8"?>
<CIM CIMVERSION="2.0" DTDVERSION="2.0">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0">
<SIMPLEREQ>
@@ -65,7 +134,7 @@
</KEYBINDING>
<KEYBINDING NAME="Name">
<KEYVALUE>'
- CLPOST='</KEYVALUE>
+ CLDPOST='</KEYVALUE>
</KEYBINDING>
</INSTANCENAME>
</IPARAMVALUE>
@@ -77,17 +146,25 @@
j=1
while [ $j -le $lim ]
do
- XML=$CLPRE"limitTest_"$j$CLPOST
+ XML=$CLSPRE"limitTest_"$j$CLSPOST
+ echo $XML > ./limitTest.xml
+ sendxml ./limitTest.xml /dev/null
+ XML=$CLDPRE"limitTest_"$j$CLDPOST
echo $XML > ./limitTest.xml
sendxml ./limitTest.xml /dev/null
j=$((j+1))
done
- XML=$CLPRE"limitTest_final"$CLPOST
+ XML=$CLSPRE"limitTest_final"$CLSPOST
+ echo $XML > ./limitTest.xml
+ sendxml ./limitTest.xml /dev/null
+ XML=$CLDPRE"limitTest_final"$CLDPOST
echo $XML > ./limitTest.xml
sendxml ./limitTest.xml /dev/null
rm ./limitTest.xml
rm ./limitTest.result
+ wbemcat IndTest7DeleteFilter.xml > /dev/null
+ wbemcat limitTestDF2.xml > /dev/null
}
# Start of main
@@ -138,7 +215,7 @@
# Create 100 Listener Destinations
j=1
-echo -n " Testing LD limit ..."
+echo -n " Testing LD limit "
while [ $j -le $lim ]
do
# Use "limitTest_xxx" as the name
@@ -159,7 +236,9 @@
# some reason. Might be ok, so just flag it
# and continue. It's possible other instances
# existed before the test was run.
- echo -n " Create $j failed ... continuing ..."
+ echo -n "X"
+ else
+ echo -n "."
fi
j=$((j+1))
done
@@ -179,6 +258,167 @@
exit 1;
fi
echo " PASSED"
-cleanup
+#
+# Now check for active subscriptions
+#
+
+PRE='<?xml version="1.0" encoding="utf-8"?>
+<CIM CIMVERSION="2.0" DTDVERSION="2.0">
+ <MESSAGE ID="4711" PROTOCOLVERSION="1.0">
+ <SIMPLEREQ>
+ <IMETHODCALL NAME="CreateInstance">
+ <LOCALNAMESPACEPATH>
+ <NAMESPACE NAME="root"/>
+ <NAMESPACE NAME="interop"/>
+ </LOCALNAMESPACEPATH>
+ <IPARAMVALUE NAME="NewInstance">
+ <INSTANCE CLASSNAME="CIM_IndicationSubscription">
+ <PROPERTY.REFERENCE NAME="Filter"
+ REFERENCECLASS="CIM_IndicationFilter">
+ <VALUE.REFERENCE>
+ <INSTANCENAME CLASSNAME="CIM_IndicationFilter">
+ <KEYBINDING NAME="SystemCreationClassName">
+ <KEYVALUE VALUETYPE="string">
+ CIM_ComputerSystem
+ </KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="SystemName">
+ <KEYVALUE VALUETYPE="string">
+ localhost.localdomain
+ </KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="CreationClassName">
+ <KEYVALUE VALUETYPE="string">
+ CIM_IndicationFilter
+ </KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="Name">
+ <KEYVALUE VALUETYPE="string">'
+MID='
+ </KEYVALUE>
+ </KEYBINDING>
+ </INSTANCENAME>
+ </VALUE.REFERENCE>
+ </PROPERTY.REFERENCE>
+ <PROPERTY.REFERENCE NAME="Handler"
+ REFERENCECLASS="CIM_IndicationHandler">
+ <VALUE.REFERENCE>
+ <INSTANCENAME CLASSNAME="CIM_IndicationHandlerCIMXML">
+ <KEYBINDING NAME="SystemCreationClassName">
+ <KEYVALUE VALUETYPE="string">
+ CIM_ComputerSystem
+ </KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="SystemName">
+ <KEYVALUE VALUETYPE="string">
+ localhost.localdomain
+ </KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="CreationClassName">
+ <KEYVALUE VALUETYPE="string">
+ CIM_IndicationHandlerCIMXML
+ </KEYVALUE>
+ </KEYBINDING>
+ <KEYBINDING NAME="Name">
+ <KEYVALUE VALUETYPE="string">'
+
+POST='</KEYVALUE>
+ </KEYBINDING>
+ </INSTANCENAME>
+ </VALUE.REFERENCE>
+ </PROPERTY.REFERENCE>
+ <PROPERTY NAME="SubscriptionState" TYPE="uint16">
+ <VALUE> 2 </VALUE>
+ </PROPERTY>
+ </INSTANCE>
+ </IPARAMVALUE>
+ </IMETHODCALL>
+ </SIMPLEREQ>
+ </MESSAGE>
+</CIM>'
+
+POSTD='</KEYVALUE>
+ </KEYBINDING>
+ </INSTANCENAME>
+ </VALUE.REFERENCE>
+ </PROPERTY.REFERENCE>
+ <PROPERTY NAME="SubscriptionState" TYPE="uint16">
+ <VALUE> 1 </VALUE>
+ </PROPERTY>
+ </INSTANCE>
+ </IPARAMVALUE>
+ </IMETHODCALL>
+ </SIMPLEREQ>
+ </MESSAGE>
+</CIM>'
+
+# Create 100 subs
+lim=100
+j=1
+wbemcat IndTest1CreateFilter.xml > /dev/null
+wbemcat limitTestCF2.XML > /dev/null
+echo -n " Testing Sub limit "
+while [ $j -le $lim ]
+do
+ XML=$PRE"Test_Indication_Filter_"$MID"limitTest_"$j$POST
+ echo $XML > ./limitTest.xml
+ sendxml ./limitTest.xml limitTest.result
+ if [ $? -ne 0 ]
+ then
+ echo " Create $j FAILED"
+ cleanup
+ exit 1;
+ fi
+ grep "limitTest" ./limitTest.result >/dev/null 2>&1
+ if [ $? -ne 0 ]
+ then
+ # This means one of the early creates failed for
+ # some reason. Might be ok, so just flag it
+ # and continue. It's possible other instances
+ # existed before the test was run.
+ echo -n "X"
+ else
+ echo -n "."
+ fi
+ j=$((j+1))
+done
+
+# Make sure the final one fails
+XML=$PRE"limitTest_f2"$MID"limitTest_1"$POST
+echo $XML > ./limitTest.xml
+sendxml ./limitTest.xml ./limit.result
+wbemcat limitTestDS2.XML > /dev/null
+grep "limitTest" ./limit.result >/dev/null 2>&1
+if [ $? -eq 0 ]
+then
+ echo " limit not enforced. FAILED"
+ cleanup
+ exit 1;
+fi
+
+# Should be able to create a disabled one
+XML=$PRE"limitTest_f2"$MID"limitTest_1"$POSTD
+echo $XML > ./limitTest.xml
+sendxml ./limitTest.xml ./limit.result
+grep "limitTest" ./limit.result >/dev/null 2>&1
+if [ $? -ne 0 ]
+then
+ echo " disabled subscription prevented. FAILED"
+ cleanup
+ exit 1;
+fi
+# but we shouldn't be able to activate it.
+wbemcat limitTestEnableSub.XML > ./limit.result
+wbemcat limitTestDS2.XML > /dev/null
+grep "MaxActiveSubscription" ./limit.result >/dev/null 2>&1
+if [ $? -ne 0 ]
+then
+ echo " enable subscription limit not enforced. FAILED"
+ cleanup
+ exit 1;
+fi
+
+echo " PASSED"
+cleanup
exit 0
--- NEW FILE: limitTestDS2.XML ---
<?xml version="1.0" encoding="utf-8"?>
<CIM CIMVERSION="2.0" DTDVERSION="2.0">
<MESSAGE ID="4711" PROTOCOLVERSION="1.0">
<SIMPLEREQ>
<IMETHODCALL NAME="DeleteInstance">
<LOCALNAMESPACEPATH>
<NAMESPACE NAME="root"/>
<NAMESPACE NAME="interop"/>
</LOCALNAMESPACEPATH>
<IPARAMVALUE NAME="InstanceName">
<INSTANCENAME CLASSNAME="CIM_IndicationSubscription">
<KEYBINDING NAME="Filter">
<VALUE.REFERENCE>
<INSTANCENAME CLASSNAME="CIM_IndicationFilter">
<KEYBINDING NAME="SystemCreationClassName">
<KEYVALUE VALUETYPE="string">
CIM_ComputerSystem
</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="SystemName">
<KEYVALUE VALUETYPE="string">
localhost.localdomain
</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="CreationClassName">
<KEYVALUE VALUETYPE="string">
CIM_IndicationFilter
</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Name">
<KEYVALUE VALUETYPE="string">
limitTest_f2
</KEYVALUE>
</KEYBINDING>
</INSTANCENAME>
</VALUE.REFERENCE>
</KEYBINDING>
<KEYBINDING NAME="Handler">
<VALUE.REFERENCE>
<INSTANCENAME CLASSNAME="CIM_IndicationHandlerCIMXML">
<KEYBINDING NAME="SystemCreationClassName">
<KEYVALUE VALUETYPE="string">
CIM_ComputerSystem
</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="SystemName">
<KEYVALUE VALUETYPE="string">
localhost.localdomain
</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="CreationClassName">
<KEYVALUE VALUETYPE="string">
CIM_IndicationHandlerCIMXML
</KEYVALUE>
</KEYBINDING>
<KEYBINDING NAME="Name">
<KEYVALUE VALUETYPE="string">
limitTest_1
</KEYVALUE>
</KEYBINDING>
</INSTANCENAME>
</VALUE.REFERENCE>
</KEYBINDING>
</INSTANCENAME>
</IPARAMVALUE>
</IMETHODCALL>
</SIMPLEREQ>
</MESSAGE>
</CIM>
|
|
From: Dave B. <bla...@us...> - 2012-05-23 16:59:24
|
Update of /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest
In directory vz-cvs-3.sog:/tmp/cvs-serv27914/utst/org/sblim/cimclient/unittest
Modified Files:
Tag: Experimental
testcases.wbem.txt
Log Message:
3529062 - WBEMListenerFactory should return new instance
Index: testcases.wbem.txt
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/testcases.wbem.txt,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- testcases.wbem.txt 3 May 2012 11:14:13 -0000 1.1.2.1
+++ testcases.wbem.txt 23 May 2012 16:59:22 -0000 1.1.2.2
@@ -1 +1,2 @@
-wbem.WBEMClientTest
\ No newline at end of file
+wbem.WBEMClientTest
+wbem.WBEMListenerTest
\ No newline at end of file
|
|
From: Dave B. <bla...@us...> - 2012-05-23 10:03:46
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/operations
In directory vz-cvs-3.sog:/tmp/cvs-serv11675/src/org/sblim/cimclient/internal/wbem/operations
Modified Files:
CIMGetClassOp.java
Log Message:
3525150 - Remove CIMGetClassOp.getPropertyLis
Index: CIMGetClassOp.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/operations/CIMGetClassOp.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CIMGetClassOp.java 5 Mar 2009 16:59:22 -0000 1.5
+++ CIMGetClassOp.java 23 May 2012 10:03:44 -0000 1.6
@@ -1,7 +1,7 @@
/**
* CIMGetClassOp.java
*
- * (C) Copyright IBM Corp. 2005, 2009
+ * (C) Copyright IBM Corp. 2005, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -20,6 +20,7 @@
* 1535756 2006-08-07 lupusalex Make code warning free
* 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
+ * 3525150 2012-05-09 blaschke-oss Remove CIMGetClassOp.getPropertyLis
*/
package org.sblim.cimclient.internal.wbem.operations;
@@ -95,14 +96,4 @@
return this.iPropertyList;
}
- /**
- * Returns propertyList
- *
- * @return The value of propertyList.
- * @deprecated Typo in method name. Use getPropertyList() instead
- */
- @Deprecated
- public String[] getPropertyLis() {
- return this.iPropertyList;
- }
}
|
|
From: Dave B. <bla...@us...> - 2012-05-23 09:59:55
|
Update of /cvsroot/sblim/jsr48-client In directory vz-cvs-3.sog:/tmp/cvs-serv9425 Modified Files: NEWS Log Message: 3525145 - Remove CIMDeleteNameSpaceOp.getNamespace Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.298 retrieving revision 1.299 diff -u -d -r1.298 -r1.299 --- NEWS 23 May 2012 09:55:23 -0000 1.298 +++ NEWS 23 May 2012 09:59:53 -0000 1.299 @@ -1,5 +1,6 @@ Changes in HEAD ================ +3525145 Remove CIMDeleteNameSpaceOp.getNamespace 3525138 Remove WBEMConstants.PROTOCOL_CIMXML 3525135 Remove CIMResponse.isSuccessul 3525128 Remove WBEMTransportException/WBEMAuthenticationException |
|
From: Dave B. <bla...@us...> - 2012-05-23 09:55:25
|
Update of /cvsroot/sblim/jsr48-client In directory vz-cvs-3.sog:/tmp/cvs-serv9342 Modified Files: NEWS Log Message: 3525138 - Remove WBEMConstants.PROTOCOL_CIMXML Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.297 retrieving revision 1.298 diff -u -d -r1.297 -r1.298 --- NEWS 23 May 2012 09:49:43 -0000 1.297 +++ NEWS 23 May 2012 09:55:23 -0000 1.298 @@ -1,5 +1,6 @@ Changes in HEAD ================ +3525138 Remove WBEMConstants.PROTOCOL_CIMXML 3525135 Remove CIMResponse.isSuccessul 3525128 Remove WBEMTransportException/WBEMAuthenticationException 3523918 "java.io.IOException: Unexpected EOF" returned as HTTP 401 |
|
From: Dave B. <bla...@us...> - 2012-05-23 09:49:45
|
Update of /cvsroot/sblim/jsr48-client In directory vz-cvs-3.sog:/tmp/cvs-serv9224 Modified Files: NEWS Log Message: 3525135 - Remove CIMResponse.isSuccessul Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.296 retrieving revision 1.297 diff -u -d -r1.296 -r1.297 --- NEWS 23 May 2012 09:44:00 -0000 1.296 +++ NEWS 23 May 2012 09:49:43 -0000 1.297 @@ -1,5 +1,6 @@ Changes in HEAD ================ +3525135 Remove CIMResponse.isSuccessul 3525128 Remove WBEMTransportException/WBEMAuthenticationException 3523918 "java.io.IOException: Unexpected EOF" returned as HTTP 401 3522904 Add new API WBEMClientSBLIM.isActive() |
|
From: Dave B. <bla...@us...> - 2012-05-23 09:44:03
|
Update of /cvsroot/sblim/jsr48-client In directory vz-cvs-3.sog:/tmp/cvs-serv7953 Modified Files: NEWS Log Message: 3525128 - Remove WBEMTransportException/WBEMAuthenticationException Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.295 retrieving revision 1.296 diff -u -d -r1.295 -r1.296 --- NEWS 22 May 2012 02:31:23 -0000 1.295 +++ NEWS 23 May 2012 09:44:00 -0000 1.296 @@ -1,5 +1,6 @@ Changes in HEAD ================ +3525128 Remove WBEMTransportException/WBEMAuthenticationException 3523918 "java.io.IOException: Unexpected EOF" returned as HTTP 401 3522904 Add new API WBEMClientSBLIM.isActive() 3521328 JSR48 1.0.0: remove WBEMClient associators and references |
|
From: Dave B. <bla...@us...> - 2012-05-22 02:31:26
|
Update of /cvsroot/sblim/jsr48-client In directory vz-cvs-3.sog:/tmp/cvs-serv18264 Modified Files: NEWS Log Message: 3523918 - "java.io.IOException: Unexpected EOF" returned as HTTP 401 Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.294 retrieving revision 1.295 diff -u -d -r1.294 -r1.295 --- NEWS 22 May 2012 02:22:12 -0000 1.294 +++ NEWS 22 May 2012 02:31:23 -0000 1.295 @@ -1,5 +1,6 @@ Changes in HEAD ================ +3523918 "java.io.IOException: Unexpected EOF" returned as HTTP 401 3522904 Add new API WBEMClientSBLIM.isActive() 3521328 JSR48 1.0.0: remove WBEMClient associators and references 3521119 JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors |