Menu
▾
▴
[Omc-commit] SF.net SVN: omc:[1109] cmpi-bindings/trunk
|
From: <mik...@us...> - 2008-10-16 17:24:13
|
Revision: 1109
http://omc.svn.sourceforge.net/omc/?rev=1109&view=rev
Author: mike-brasher
Date: 2008-10-16 17:24:00 +0000 (Thu, 16 Oct 2008)
Log Message:
-----------
Implemented scheme to work around CIMSetPropertyFilter() bug in pegasus
by always injecting key names into property list (obtained from object path)
prior to calling CIMSetPropertyFilter().
Modified Paths:
--------------
cmpi-bindings/trunk/swig/cmpi.i
cmpi-bindings/trunk/swig/cmpi_callbacks.i
cmpi-bindings/trunk/swig/cmpi_types.i
cmpi-bindings/trunk/test/python/test_assoc.py
Added Paths:
-----------
cmpi-bindings/trunk/swig/string_array.h
Modified: cmpi-bindings/trunk/swig/cmpi.i
===================================================================
--- cmpi-bindings/trunk/swig/cmpi.i 2008-10-16 16:00:23 UTC (rev 1108)
+++ cmpi-bindings/trunk/swig/cmpi.i 2008-10-16 17:24:00 UTC (rev 1109)
@@ -357,6 +357,16 @@
} \
while (0)
+/*
+**==============================================================================
+**
+** String array implementation functions.
+**
+**==============================================================================
+*/
+
+#include "string_array.h"
+
%}
%exceptionclass CMPIException;
Modified: cmpi-bindings/trunk/swig/cmpi_callbacks.i
===================================================================
--- cmpi-bindings/trunk/swig/cmpi_callbacks.i 2008-10-16 16:00:23 UTC (rev 1108)
+++ cmpi-bindings/trunk/swig/cmpi_callbacks.i 2008-10-16 17:24:00 UTC (rev 1109)
@@ -263,12 +263,9 @@
CMSetStatusWithChars($self, &st, CMPI_RC_ERR_FAILED,
"object path has no namespace");
_raise_ex(&st);
-printf("EXCEPTION..................................................\n");
return NULL;
}
-printf("NAMESPACE[%s]\n", str);
-
result = CMNewInstance($self, path, &st);
RAISE_IF(st);
Modified: cmpi-bindings/trunk/swig/cmpi_types.i
===================================================================
--- cmpi-bindings/trunk/swig/cmpi_types.i 2008-10-16 16:00:23 UTC (rev 1108)
+++ cmpi-bindings/trunk/swig/cmpi_types.i 2008-10-16 17:24:00 UTC (rev 1109)
@@ -869,7 +869,77 @@
*/
void set_property_filter(const char **properties)
{
- RAISE_IF(CMSetPropertyFilter($self, properties, NULL));
+ CMPIStatus st = { CMPI_RC_OK, NULL };
+ CMPIObjectPath* cop;
+ CMPICount n;
+ CMPICount i;
+ CMPIData cd;
+ char** props;
+
+ /* Make copy of property list (we may modify it) */
+
+ props = string_array_clone((char**)properties);
+
+#if 0
+ string_array_print(props);
+#endif
+
+ /* Pegasus requires that the keys be in the property list, else it
+ * throws an exception. To work around, add key properties to property
+ * list.
+ */
+
+ if (!(cop = CMGetObjectPath($self, &st)) || st.rc)
+ {
+ st.rc = CMPI_RC_ERR_FAILED;
+ RAISE_IF(st);
+ string_array_free(props);
+ return;
+ }
+
+ n = CMGetKeyCount(cop, &st);
+
+ if (st.rc)
+ {
+ RAISE_IF(st);
+ string_array_free(props);
+ return;
+ }
+
+ for (i = 0; i < n; i++)
+ {
+ CMPIString* pn = NULL;
+ char* str;
+
+ cd = CMGetKeyAt(cop, i, &pn, &st);
+
+ if (st.rc)
+ {
+ RAISE_IF(st);
+ string_array_free(props);
+ return;
+ }
+
+ str = CMGetCharsPtr(pn, &st);
+
+ if (st.rc)
+ {
+ RAISE_IF(st);
+ string_array_free(props);
+ return;
+ }
+
+ if (string_array_find_ignore_case(props, str) == NULL)
+ props = string_array_append(props, str);
+ }
+
+#if 0
+ string_array_print(props);
+#endif
+
+ RAISE_IF(CMSetPropertyFilter($self, (const char**)props, NULL));
+
+ string_array_free(props);
}
/* Add/replace a named Property value and origin
Added: cmpi-bindings/trunk/swig/string_array.h
===================================================================
--- cmpi-bindings/trunk/swig/string_array.h (rev 0)
+++ cmpi-bindings/trunk/swig/string_array.h 2008-10-16 17:24:00 UTC (rev 1109)
@@ -0,0 +1,121 @@
+/*
+ * This file defines functions for manipulating null-terminated arrays of
+ * pointers to strings (string arrays).
+ */
+#ifndef string_array_h
+#define string_array_h
+
+#include <stdio.h>
+#include <stdlib.h>
+
+static size_t string_array_size(char** array)
+{
+ char** p;
+
+ if (!array)
+ return 0;
+
+ for (p = array; *p; p++)
+ ;
+
+ return p - array;
+}
+
+static char** string_array_clone(char** array)
+{
+ char** p;
+ size_t n;
+ size_t i;
+
+ if (!array)
+ {
+ p = (char**)malloc(sizeof(char*));
+ *p = NULL;
+ return p;
+ }
+
+ n = string_array_size(array);
+
+ if (!(p = (char**)malloc((n + 1) * sizeof(char*))))
+ return NULL;
+
+ for (i = 0; i < n; i++)
+ p[i] = strdup(array[i]);
+
+ p[i] = NULL;
+
+ return p;
+}
+
+static char** string_array_append(char** array, const char* str)
+{
+ size_t n;
+
+ n = string_array_size(array);
+
+ if (!(array = (char**)realloc(array, (n + 2) * sizeof(char*))))
+ return NULL;
+
+ array[n] = strdup(str);
+ array[n+1] = NULL;
+
+ return array;
+}
+
+static void string_array_free(char** array)
+{
+ char** p;
+
+ if (!array)
+ return;
+
+ for (p = array; *p; p++)
+ free(*p);
+
+ free(array);
+}
+
+static const char* string_array_find(char** array, const char* str)
+{
+ char** p;
+
+ for (p = array; *p; p++)
+ {
+ if (strcmp(*p, str) == 0)
+ return *p;
+ }
+
+ /* Not found! */
+ return NULL;
+}
+
+static const char* string_array_find_ignore_case(char** array, const char* str)
+{
+ char** p;
+
+ for (p = array; *p; p++)
+ {
+ if (strcasecmp(*p, str) == 0)
+ return *p;
+ }
+
+ /* Not found! */
+ return NULL;
+}
+
+static void string_array_print(char** array)
+{
+ char** p;
+
+ printf("string_array\n");
+ printf("{\n");
+
+ for (p = array; *p; p++)
+ {
+ printf(" {%s}\n", *p);
+ }
+
+ printf("}\n");
+}
+
+#endif /* string_array_h */
Modified: cmpi-bindings/trunk/test/python/test_assoc.py
===================================================================
--- cmpi-bindings/trunk/test/python/test_assoc.py 2008-10-16 16:00:23 UTC (rev 1108)
+++ cmpi-bindings/trunk/test/python/test_assoc.py 2008-10-16 17:24:00 UTC (rev 1109)
@@ -1007,10 +1007,11 @@
self.fail('KeyError caught trying to read "Dependent" property that should exist.')
isValid=False
try:
- if ref['Antecedent'] is not None and len(ref['Antecedent']) > 0:
- self.fail('Reference antecedent is set when it should not be (%s).' % ref['Antecedent'])
- if ref['isPrimaryGroup'] is not None:
- self.fail('Reference property "isPrimaryGroup" is set when it should not be (%s).' % ref['isPrimaryGroup'])
+ # ATTN: This fails since we always include keys.
+ #if ref['Antecedent'] is not None and len(ref['Antecedent']) > 0:
+ # self.fail('Reference antecedent is set when it should not be (%s).' % ref['Antecedent'])
+ #if ref['isPrimaryGroup'] is not None:
+ # self.fail('Reference property "isPrimaryGroup" is set when it should not be (%s).' % ref['isPrimaryGroup'])
isValid=True
except KeyError:
# not an error
@@ -1043,8 +1044,9 @@
self.fail('KeyError caught trying to read properties that should exist.')
isValid=False
try:
- if ref['Dependent'] is not None and len(ref['Dependent']) > 0:
- self.fail('Reference dependent is set when it should not be (%s).' % ref['Dependent'])
+ # This fails since we always include the keys.
+ #if ref['Dependent'] is not None and len(ref['Dependent']) > 0:
+ # self.fail('Reference dependent is set when it should not be (%s).' % ref['Dependent'])
isValid=True
except KeyError:
# not an error
@@ -1063,8 +1065,8 @@
self.fail('KeyError caught trying to read antecedent property that should exist.')
isValid=False
try:
- if ref['Dependent'] is not None and len(ref['Dependent']) > 0:
- self.fail('Reference dependent is set when it should not be (%s).' % ref['Dependent'])
+ #if ref['Dependent'] is not None and len(ref['Dependent']) > 0:
+ # self.fail('Reference dependent is set when it should not be (%s).' % ref['Dependent'])
isValid=True
except KeyError:
# not an error
@@ -1093,8 +1095,8 @@
self.fail('KeyError caught trying to read properties that should exist.')
isValid=False
try:
- if ref['Antecedent'] is not None and len(ref['Antecedent']) > 0:
- self.fail('Reference antecedent is set when it should not be (%s).' % ref['Antecedent'])
+ #if ref['Antecedent'] is not None and len(ref['Antecedent']) > 0:
+ # self.fail('Reference antecedent is set when it should not be (%s).' % ref['Antecedent'])
isValid=True
except KeyError:
# not an error
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
