Pass correct key values when creating a Cim_IndicationSubscription
Found and fixed by Santosh_Bidaralli@Dell.com
cim_create_indication_subscription() was adding “OnFatalErrorPolicy,
SubscriptionState, SubscriptionDuration, RepeatNotificationPolicy”
properties as keys to object path, whereas these properties are not the
keys.
The only keys for subscriptions are Filter and Handler and all other
operations related to subscription such as Delete, Update and etc. use
Filter and Handler as the keys.
Actual root cause is that, when a subscription is created the
Subscription hash table inside SFCB was storing the object path as the
key and when unsubscribe request is sent, SFCB tries to look for this
key which does not contain above mentioned properties in the object path
and hence it fails to find the subscription in its hash table.
diff --git a/src/plugins/cim/sfcc-interface.c b/src/plugins/cim/sfcc-interface.c
index bc9267e..527b7a8 100644
--- a/src/plugins/cim/sfcc-interface.c
+++ b/src/plugins/cim/sfcc-interface.c
@@ -2505,26 +2505,26 @@
value.ref = handler;
CMAddKey(objectpath, "Handler",
&value, CMPI_ref);
+ instance = newCMPIInstance(objectpath, NULL);
//set OnFatalErrorPolicy to "Ignore"
value.uint16 = 2;
- CMAddKey(objectpath, "OnFatalErrorPolicy",
+ CMSetProperty(instance, "OnFatalErrorPolicy",
&value, CMPI_uint16);
//enable subscription
value.uint16 = 2;
- CMAddKey(objectpath, "SubscriptionState",
+ CMSetProperty(instance, "SubscriptionState",
&value, CMPI_uint16);
if(subsInfo->expires) {
struct timeval tv;
gettimeofday(&tv, NULL);
value.uint64 = subsInfo->expires - tv.tv_sec;
- CMAddKey(objectpath, "subscriptionDuration",
+ CMSetProperty(instance, "SubscriptionDuration",
&value, CMPI_uint64);
}
//set RepeatNotificationPolicy to None
value.uint16 = 2;
- CMAddKey(objectpath, "RepeatNotificationPolicy",
+ CMSetProperty(instance, "RepeatNotificationPolicy",
&value, CMPI_uint16);
- instance = newCMPIInstance(objectpath, NULL);
instance_r = cc->ft->createInstance(cc, objectpath, instance, &rc);
/* Print the results */
