subject:"Re\: \[devel\] \[PATCH 1 of 1\] amfd\: Add support for admin op result strings \[#85\]"

Re: [devel] [PATCH 1 of 1] amfd: Add support for admin op result strings [#85]

2013-11-20 Thread Hans Feldt

So before there was a mix of saflog and syslog usage. Upfront errors used was 
logged using syslog and later discovered 
errors logged using saflog. The OK case went to saflog only. TRYAGAIN errors 
was logged in syslog.

So first we should unify on using saflog for all errors, done.

Second include or filter out TRYAGAIN type of errors?

I think you have a point, since they we logged previously we should continue 
doing it.

Which basically leaves the logging of error string from my extra patch:

 +
 +   // log error string separately to maintain some backwards 
 compatibility
 +   saflog(LOG_NOTICE, amfSvcUsrName,
 +   Admin op invocation: %llu, err: '%s', invocation, 
 ao_err_string);
 +
 saflog(LOG_NOTICE, amfSvcUsrName, Admin op done for invocation: 
 %llu, result %u,

What do you think?

Thanks,
Hans



On 11/20/2013 09:32 AM, Nagendra Kumar wrote:
 Wont we miss corresponding try again result as part of admin request ?

 Thanks
 -Nagu

 -Original Message-
 From: Hans Feldt [mailto:hans.fe...@ericsson.com]
 Sent: 20 November 2013 12:59
 To: Nagendra Kumar; hans.nordeb...@ericsson.com
 Cc: opensaf-devel@lists.sourceforge.net
 Subject: Re: [devel] [PATCH 1 of 1] amfd: Add support for admin op result 
 strings [#85]


 On 11/20/2013 08:23 AM, Nagendra Kumar wrote:
 Hi Hans,
  Sure. Would you like to combine two saflog into one ?

 No, please check my patch. I have 2 logs for two reasons 1) to keep some 
 backwards compatibility and 2) not to create
 too long lines in the log.

 Example output in saflog:

  69 07:57:41 11/20/2013 NO safApp=safAmfService Admin op UNLOCK 
 initiated for 'safSu=SC-2,safSg=2N,safApp=OpenSAF', invocation: 47244640257
  70 07:57:41 11/20/2013 NO safApp=safAmfService Admin op 
 invocation: 47244640257, err: 'Admin operation (1) has no effect on current 
 state (1)'
  71 07:57:41 11/20/2013 NO safApp=safAmfService Admin op done for 
 invocation: 47244640257, result 28

 So please review and comment my patch and I will push.

 Thanks,
 Hans


 Thanks
 -Nagu
 -Original Message-
 From: Hans Feldt [mailto:hans.fe...@ericsson.com]
 Sent: 20 November 2013 12:34
 To: Nagendra Kumar; hans.nordeb...@ericsson.com
 Cc: opensaf-devel@lists.sourceforge.net
 Subject: Re: [devel] [PATCH 1 of 1] amfd: Add support for admin op result 
 strings [#85]

 I can see you have pushed but I have some minor improvements that can give 
 us problems if not fixed now:

 1) the saflog call in report_admin_op_error() needs to be protected so it is 
 not called when the error code is TRYAGAIN

 2) the error string should be logged to saflog, otherwise on case of SMF 
 doing the admin op there will be nothing logged
 and troubleshooting will be hard.

 Patch attached, please review and I can push.

 Thanks,
 Hans


--
Shape the Mobile Experience: Free Subscription
Software experts and developers: Be at the forefront of tech innovation.
Intel(R) Software Adrenaline delivers strategic insight and game-changing 
conversations that shape the rapidly evolving mobile landscape. Sign up now. 
http://pubads.g.doubleclick.net/gampad/clk?id=63431311iu=/4140/ostg.clktrk
___
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Re: [devel] [PATCH 1 of 1] amfd: Add support for admin op result strings [#85]

2013-11-20 Thread Nagendra Kumar

Hi Hans,

 Which basically leaves the logging of error string from my extra patch:
 What do you think?

Fine with me.

Thanks
-Nagu

-Original Message-
From: Hans Feldt [mailto:hans.fe...@ericsson.com] 
Sent: 20 November 2013 15:53
To: Nagendra Kumar; hans.nordeb...@ericsson.com
Cc: opensaf-devel@lists.sourceforge.net
Subject: Re: [devel] [PATCH 1 of 1] amfd: Add support for admin op result 
strings [#85]

So before there was a mix of saflog and syslog usage. Upfront errors used was 
logged using syslog and later discovered errors logged using saflog. The OK 
case went to saflog only. TRYAGAIN errors was logged in syslog.

So first we should unify on using saflog for all errors, done.

Second include or filter out TRYAGAIN type of errors?

I think you have a point, since they we logged previously we should continue 
doing it.

Which basically leaves the logging of error string from my extra patch:

 +
 +   // log error string separately to maintain some backwards 
 compatibility
 +   saflog(LOG_NOTICE, amfSvcUsrName,
 +   Admin op invocation: %llu, err: '%s', 
 + invocation, ao_err_string);
 +
 saflog(LOG_NOTICE, amfSvcUsrName, Admin op done for 
 invocation: %llu, result %u,

What do you think?

Thanks,
Hans



On 11/20/2013 09:32 AM, Nagendra Kumar wrote:
 Wont we miss corresponding try again result as part of admin request ?

 Thanks
 -Nagu

 -Original Message-
 From: Hans Feldt [mailto:hans.fe...@ericsson.com]
 Sent: 20 November 2013 12:59
 To: Nagendra Kumar; hans.nordeb...@ericsson.com
 Cc: opensaf-devel@lists.sourceforge.net
 Subject: Re: [devel] [PATCH 1 of 1] amfd: Add support for admin op 
 result strings [#85]


 On 11/20/2013 08:23 AM, Nagendra Kumar wrote:
 Hi Hans,
  Sure. Would you like to combine two saflog into one ?

 No, please check my patch. I have 2 logs for two reasons 1) to keep 
 some backwards compatibility and 2) not to create too long lines in the log.

 Example output in saflog:

  69 07:57:41 11/20/2013 NO safApp=safAmfService Admin op UNLOCK 
 initiated for 'safSu=SC-2,safSg=2N,safApp=OpenSAF', invocation: 47244640257
  70 07:57:41 11/20/2013 NO safApp=safAmfService Admin op 
 invocation: 47244640257, err: 'Admin operation (1) has no effect on current 
 state (1)'
  71 07:57:41 11/20/2013 NO safApp=safAmfService Admin op 
 done for invocation: 47244640257, result 28

 So please review and comment my patch and I will push.

 Thanks,
 Hans


 Thanks
 -Nagu
 -Original Message-
 From: Hans Feldt [mailto:hans.fe...@ericsson.com]
 Sent: 20 November 2013 12:34
 To: Nagendra Kumar; hans.nordeb...@ericsson.com
 Cc: opensaf-devel@lists.sourceforge.net
 Subject: Re: [devel] [PATCH 1 of 1] amfd: Add support for admin op 
 result strings [#85]

 I can see you have pushed but I have some minor improvements that can give 
 us problems if not fixed now:

 1) the saflog call in report_admin_op_error() needs to be protected 
 so it is not called when the error code is TRYAGAIN

 2) the error string should be logged to saflog, otherwise on case of 
 SMF doing the admin op there will be nothing logged and troubleshooting will 
 be hard.

 Patch attached, please review and I can push.

 Thanks,
 Hans


--
Shape the Mobile Experience: Free Subscription
Software experts and developers: Be at the forefront of tech innovation.
Intel(R) Software Adrenaline delivers strategic insight and game-changing 
conversations that shape the rapidly evolving mobile landscape. Sign up now. 
http://pubads.g.doubleclick.net/gampad/clk?id=63431311iu=/4140/ostg.clktrk
___
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Re: [devel] [PATCH 1 of 1] amfd: Add support for admin op result strings [#85]

2013-11-20 Thread Hans Feldt

OK I will push then.
/Hans

On 11/20/2013 11:38 AM, Nagendra Kumar wrote:
 Hi Hans,

 Which basically leaves the logging of error string from my extra patch:
 What do you think?

 Fine with me.

 Thanks
 -Nagu

 -Original Message-
 From: Hans Feldt [mailto:hans.fe...@ericsson.com]
 Sent: 20 November 2013 15:53
 To: Nagendra Kumar; hans.nordeb...@ericsson.com
 Cc: opensaf-devel@lists.sourceforge.net
 Subject: Re: [devel] [PATCH 1 of 1] amfd: Add support for admin op result 
 strings [#85]

 So before there was a mix of saflog and syslog usage. Upfront errors used was 
 logged using syslog and later discovered errors logged using saflog. The OK 
 case went to saflog only. TRYAGAIN errors was logged in syslog.

 So first we should unify on using saflog for all errors, done.

 Second include or filter out TRYAGAIN type of errors?

 I think you have a point, since they we logged previously we should continue 
 doing it.

 Which basically leaves the logging of error string from my extra patch:

 +
 +   // log error string separately to maintain some backwards 
 compatibility
 +   saflog(LOG_NOTICE, amfSvcUsrName,
 +   Admin op invocation: %llu, err: '%s',
 + invocation, ao_err_string);
 +
  saflog(LOG_NOTICE, amfSvcUsrName, Admin op done for
 invocation: %llu, result %u,

 What do you think?

 Thanks,
 Hans



 On 11/20/2013 09:32 AM, Nagendra Kumar wrote:
 Wont we miss corresponding try again result as part of admin request ?

 Thanks
 -Nagu

 -Original Message-
 From: Hans Feldt [mailto:hans.fe...@ericsson.com]
 Sent: 20 November 2013 12:59
 To: Nagendra Kumar; hans.nordeb...@ericsson.com
 Cc: opensaf-devel@lists.sourceforge.net
 Subject: Re: [devel] [PATCH 1 of 1] amfd: Add support for admin op
 result strings [#85]


 On 11/20/2013 08:23 AM, Nagendra Kumar wrote:
 Hi Hans,
 Sure. Would you like to combine two saflog into one ?

 No, please check my patch. I have 2 logs for two reasons 1) to keep
 some backwards compatibility and 2) not to create too long lines in the 
 log.

 Example output in saflog:

   69 07:57:41 11/20/2013 NO safApp=safAmfService Admin op UNLOCK 
 initiated for 'safSu=SC-2,safSg=2N,safApp=OpenSAF', invocation: 47244640257
   70 07:57:41 11/20/2013 NO safApp=safAmfService Admin op 
 invocation: 47244640257, err: 'Admin operation (1) has no effect on current 
 state (1)'
   71 07:57:41 11/20/2013 NO safApp=safAmfService Admin op
 done for invocation: 47244640257, result 28

 So please review and comment my patch and I will push.

 Thanks,
 Hans


 Thanks
 -Nagu
 -Original Message-
 From: Hans Feldt [mailto:hans.fe...@ericsson.com]
 Sent: 20 November 2013 12:34
 To: Nagendra Kumar; hans.nordeb...@ericsson.com
 Cc: opensaf-devel@lists.sourceforge.net
 Subject: Re: [devel] [PATCH 1 of 1] amfd: Add support for admin op
 result strings [#85]

 I can see you have pushed but I have some minor improvements that can give 
 us problems if not fixed now:

 1) the saflog call in report_admin_op_error() needs to be protected
 so it is not called when the error code is TRYAGAIN

 2) the error string should be logged to saflog, otherwise on case of
 SMF doing the admin op there will be nothing logged and troubleshooting 
 will be hard.

 Patch attached, please review and I can push.

 Thanks,
 Hans




--
Shape the Mobile Experience: Free Subscription
Software experts and developers: Be at the forefront of tech innovation.
Intel(R) Software Adrenaline delivers strategic insight and game-changing 
conversations that shape the rapidly evolving mobile landscape. Sign up now. 
http://pubads.g.doubleclick.net/gampad/clk?id=63431311iu=/4140/ostg.clktrk
___
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Re: [devel] [PATCH 1 of 1] amfd: Add support for admin op result strings [#85]

2013-11-19 Thread Nagendra Kumar

Would like to push it as soon as possible. Comments ??

Thanks
-Nagu
-Original Message-
From: Nagendra Kumar 
Sent: 15 November 2013 12:34
To: hans.fe...@ericsson.com; hans.nordeb...@ericsson.com
Cc: opensaf-devel@lists.sourceforge.net
Subject: Re: [devel] [PATCH 1 of 1] amfd: Add support for admin op result 
strings [#85]

Hi,
Just to inform you that I have not converted all Error cases in this 
patch. 
For example: 
In file sg_2n_fsm.cc: function avd_sg_2n_susi_fail_func():
avd_saImmOiAdminOperationResult(cb-immOiHandle, l_susi-si-invocation, 
SA_AIS_ERR_BAD_OPERATION);

Other places like in sgproc.cc : su_complete_admin_op(i_su, 
SA_AIS_ERR_TIMEOUT); su_disable_comps(i_su, SA_AIS_ERR_TIMEOUT);

Here we don't have any reason explicit, so response will go as usual.

Any comments ?

Thanks
-Nagu

-Original Message-
From: Nagendra Kumar 
Sent: 14 November 2013 14:32
To: hans.fe...@ericsson.com; hans.nordeb...@ericsson.com
Cc: opensaf-devel@lists.sourceforge.net
Subject: [devel] [PATCH 1 of 1] amfd: Add support for admin op result strings 
[#85]

 osaf/services/saf/amf/amfd/app.cc|  24 +++---
 osaf/services/saf/amf/amfd/cluster.cc|   6 +-
 osaf/services/saf/amf/amfd/comp.cc   |  36 --
 osaf/services/saf/amf/amfd/imm.cc|  41 +
 osaf/services/saf/amf/amfd/include/imm.h |   3 +
 osaf/services/saf/amf/amfd/ndproc.cc |  51 +++-
 osaf/services/saf/amf/amfd/node.cc   |  99 +--
 osaf/services/saf/amf/amfd/sg.cc |  87 +++
 osaf/services/saf/amf/amfd/sgproc.cc |  14 +--
 osaf/services/saf/amf/amfd/si.cc |  70 --
 osaf/services/saf/amf/amfd/su.cc |  86 +--
 11 files changed, 281 insertions(+), 236 deletions(-)


diff --git a/osaf/services/saf/amf/amfd/app.cc 
b/osaf/services/saf/amf/amfd/app.cc
--- a/osaf/services/saf/amf/amfd/app.cc
+++ b/osaf/services/saf/amf/amfd/app.cc
@@ -357,7 +357,6 @@ static void app_admin_op_cb(SaImmOiHandl
const SaNameT *object_name, SaImmAdminOperationIdT op_id,
const SaImmAdminOperationParamsT_2 **params)
 {
-   SaAisErrorT rc;
AVD_APP *app;
 
TRACE_ENTER2(%s, object_name-value);
@@ -368,28 +367,28 @@ static void app_admin_op_cb(SaImmOiHandl
 
if (op_id == SA_AMF_ADMIN_UNLOCK) {
if (app-saAmfApplicationAdminState == SA_AMF_ADMIN_UNLOCKED) {
-   LOG_ER(%s is already unlocked, object_name-value);
-   rc = SA_AIS_ERR_NO_OP;
+   report_admin_op_error(immOiHandle, invocation, 
SA_AIS_ERR_NO_OP, NULL,
+   %s is already unlocked, 
object_name-value);
goto done;
}
 
if (app-saAmfApplicationAdminState == 
SA_AMF_ADMIN_LOCKED_INSTANTIATION) {
-   LOG_ER(%s is locked instantiation, 
object_name-value);
-   rc = SA_AIS_ERR_BAD_OPERATION;
+   report_admin_op_error(immOiHandle, invocation, 
SA_AIS_ERR_BAD_OPERATION, NULL,
+   %s is locked instantiation, 
object_name-value);
goto done;
}
}
 
if (op_id == SA_AMF_ADMIN_LOCK) {
if (app-saAmfApplicationAdminState == SA_AMF_ADMIN_LOCKED) {
-   LOG_ER(%s is already locked, object_name-value);
-   rc = SA_AIS_ERR_NO_OP;
+   report_admin_op_error(immOiHandle, invocation, 
SA_AIS_ERR_NO_OP, NULL,
+   %s is already locked, 
object_name-value);
goto done;
}
 
if (app-saAmfApplicationAdminState == 
SA_AMF_ADMIN_LOCKED_INSTANTIATION) {
-   LOG_ER(%s is locked instantiation, 
object_name-value);
-   rc = SA_AIS_ERR_BAD_OPERATION;
+   report_admin_op_error(immOiHandle, invocation, 
SA_AIS_ERR_BAD_OPERATION, NULL,
+   %s is locked instantiation, 
object_name-value);
goto done;
}
}
@@ -409,11 +408,12 @@ static void app_admin_op_cb(SaImmOiHandl
case SA_AMF_ADMIN_UNLOCK_INSTANTIATION:
case SA_AMF_ADMIN_RESTART:
default:
-   rc = SA_AIS_ERR_NOT_SUPPORTED;
+   report_admin_op_error(immOiHandle, invocation, 
SA_AIS_ERR_NOT_SUPPORTED, NULL,
+   Not supported);
break;
}
- done:
-   avd_saImmOiAdminOperationResult(immOiHandle, invocation, rc);
+done:
+   TRACE_LEAVE();
 }
 
 static SaAisErrorT app_rt_attr_cb(SaImmOiHandleT immOiHandle,
diff --git a/osaf/services/saf/amf/amfd/cluster.cc 
b/osaf/services/saf/amf/amfd/cluster.cc
--- a/osaf/services/saf/amf/amfd/cluster.cc
+++ b/osaf/services/saf/amf

Re: [devel] [PATCH 1 of 1] amfd: Add support for admin op result strings [#85]

2013-11-19 Thread Hans Nordebäck

ack/BR HansN
On 11/19/13 11:36, Nagendra Kumar wrote:
 Would like to push it as soon as possible. Comments ??

 Thanks
 -Nagu
 -Original Message-
 From: Nagendra Kumar
 Sent: 15 November 2013 12:34
 To: hans.fe...@ericsson.com; hans.nordeb...@ericsson.com
 Cc: opensaf-devel@lists.sourceforge.net
 Subject: Re: [devel] [PATCH 1 of 1] amfd: Add support for admin op result 
 strings [#85]

 Hi,
   Just to inform you that I have not converted all Error cases in this 
 patch.
 For example:
 In file sg_2n_fsm.cc: function avd_sg_2n_susi_fail_func():
  avd_saImmOiAdminOperationResult(cb-immOiHandle, l_susi-si-invocation, 
 SA_AIS_ERR_BAD_OPERATION);

 Other places like in sgproc.cc : su_complete_admin_op(i_su, 
 SA_AIS_ERR_TIMEOUT); su_disable_comps(i_su, SA_AIS_ERR_TIMEOUT);

 Here we don't have any reason explicit, so response will go as usual.

 Any comments ?

 Thanks
 -Nagu

 -Original Message-
 From: Nagendra Kumar
 Sent: 14 November 2013 14:32
 To: hans.fe...@ericsson.com; hans.nordeb...@ericsson.com
 Cc: opensaf-devel@lists.sourceforge.net
 Subject: [devel] [PATCH 1 of 1] amfd: Add support for admin op result strings 
 [#85]

   osaf/services/saf/amf/amfd/app.cc|  24 +++---
   osaf/services/saf/amf/amfd/cluster.cc|   6 +-
   osaf/services/saf/amf/amfd/comp.cc   |  36 --
   osaf/services/saf/amf/amfd/imm.cc|  41 +
   osaf/services/saf/amf/amfd/include/imm.h |   3 +
   osaf/services/saf/amf/amfd/ndproc.cc |  51 +++-
   osaf/services/saf/amf/amfd/node.cc   |  99 
 +--
   osaf/services/saf/amf/amfd/sg.cc |  87 +++
   osaf/services/saf/amf/amfd/sgproc.cc |  14 +--
   osaf/services/saf/amf/amfd/si.cc |  70 --
   osaf/services/saf/amf/amfd/su.cc |  86 +--
   11 files changed, 281 insertions(+), 236 deletions(-)


 diff --git a/osaf/services/saf/amf/amfd/app.cc 
 b/osaf/services/saf/amf/amfd/app.cc
 --- a/osaf/services/saf/amf/amfd/app.cc
 +++ b/osaf/services/saf/amf/amfd/app.cc
 @@ -357,7 +357,6 @@ static void app_admin_op_cb(SaImmOiHandl
   const SaNameT *object_name, SaImmAdminOperationIdT op_id,
   const SaImmAdminOperationParamsT_2 **params)
   {
 - SaAisErrorT rc;
   AVD_APP *app;
   
   TRACE_ENTER2(%s, object_name-value);
 @@ -368,28 +367,28 @@ static void app_admin_op_cb(SaImmOiHandl
   
   if (op_id == SA_AMF_ADMIN_UNLOCK) {
   if (app-saAmfApplicationAdminState == SA_AMF_ADMIN_UNLOCKED) {
 - LOG_ER(%s is already unlocked, object_name-value);
 - rc = SA_AIS_ERR_NO_OP;
 + report_admin_op_error(immOiHandle, invocation, 
 SA_AIS_ERR_NO_OP, NULL,
 + %s is already unlocked, 
 object_name-value);
   goto done;
   }
   
   if (app-saAmfApplicationAdminState == 
 SA_AMF_ADMIN_LOCKED_INSTANTIATION) {
 - LOG_ER(%s is locked instantiation, 
 object_name-value);
 - rc = SA_AIS_ERR_BAD_OPERATION;
 + report_admin_op_error(immOiHandle, invocation, 
 SA_AIS_ERR_BAD_OPERATION, NULL,
 + %s is locked instantiation, 
 object_name-value);
   goto done;
   }
   }
   
   if (op_id == SA_AMF_ADMIN_LOCK) {
   if (app-saAmfApplicationAdminState == SA_AMF_ADMIN_LOCKED) {
 - LOG_ER(%s is already locked, object_name-value);
 - rc = SA_AIS_ERR_NO_OP;
 + report_admin_op_error(immOiHandle, invocation, 
 SA_AIS_ERR_NO_OP, NULL,
 + %s is already locked, 
 object_name-value);
   goto done;
   }
   
   if (app-saAmfApplicationAdminState == 
 SA_AMF_ADMIN_LOCKED_INSTANTIATION) {
 - LOG_ER(%s is locked instantiation, 
 object_name-value);
 - rc = SA_AIS_ERR_BAD_OPERATION;
 + report_admin_op_error(immOiHandle, invocation, 
 SA_AIS_ERR_BAD_OPERATION, NULL,
 + %s is locked instantiation, 
 object_name-value);
   goto done;
   }
   }
 @@ -409,11 +408,12 @@ static void app_admin_op_cb(SaImmOiHandl
   case SA_AMF_ADMIN_UNLOCK_INSTANTIATION:
   case SA_AMF_ADMIN_RESTART:
   default:
 - rc = SA_AIS_ERR_NOT_SUPPORTED;
 + report_admin_op_error(immOiHandle, invocation, 
 SA_AIS_ERR_NOT_SUPPORTED, NULL,
 + Not supported);
   break;
   }
 - done:
 - avd_saImmOiAdminOperationResult(immOiHandle, invocation, rc);
 +done:
 + TRACE_LEAVE();
   }
   
   static SaAisErrorT app_rt_attr_cb(SaImmOiHandleT immOiHandle,
 diff --git a/osaf/services/saf/amf/amfd/cluster.cc 
 b/osaf

Re: [devel] [PATCH 1 of 1] amfd: Add support for admin op result strings [#85]

2013-11-19 Thread Nagendra Kumar

Hi Hans,
Sure. Would you like to combine two saflog into one ?

Thanks
-Nagu
-Original Message-
From: Hans Feldt [mailto:hans.fe...@ericsson.com] 
Sent: 20 November 2013 12:34
To: Nagendra Kumar; hans.nordeb...@ericsson.com
Cc: opensaf-devel@lists.sourceforge.net
Subject: Re: [devel] [PATCH 1 of 1] amfd: Add support for admin op result 
strings [#85]

I can see you have pushed but I have some minor improvements that can give us 
problems if not fixed now:

1) the saflog call in report_admin_op_error() needs to be protected so it is 
not called when the error code is TRYAGAIN

2) the error string should be logged to saflog, otherwise on case of SMF doing 
the admin op there will be nothing logged 
and troubleshooting will be hard.

Patch attached, please review and I can push.

Thanks,
Hans

On 11/19/2013 11:36 AM, Nagendra Kumar wrote:
 Would like to push it as soon as possible. Comments ??

 Thanks
 -Nagu
 -Original Message-
 From: Nagendra Kumar
 Sent: 15 November 2013 12:34
 To: hans.fe...@ericsson.com; hans.nordeb...@ericsson.com
 Cc: opensaf-devel@lists.sourceforge.net
 Subject: Re: [devel] [PATCH 1 of 1] amfd: Add support for admin op result 
 strings [#85]

 Hi,
   Just to inform you that I have not converted all Error cases in this 
 patch.
 For example:
 In file sg_2n_fsm.cc: function avd_sg_2n_susi_fail_func():
  avd_saImmOiAdminOperationResult(cb-immOiHandle, l_susi-si-invocation, 
 SA_AIS_ERR_BAD_OPERATION);

 Other places like in sgproc.cc : su_complete_admin_op(i_su, 
 SA_AIS_ERR_TIMEOUT); su_disable_comps(i_su, SA_AIS_ERR_TIMEOUT);

 Here we don't have any reason explicit, so response will go as usual.

 Any comments ?

 Thanks
 -Nagu

 -Original Message-
 From: Nagendra Kumar
 Sent: 14 November 2013 14:32
 To: hans.fe...@ericsson.com; hans.nordeb...@ericsson.com
 Cc: opensaf-devel@lists.sourceforge.net
 Subject: [devel] [PATCH 1 of 1] amfd: Add support for admin op result strings 
 [#85]

   osaf/services/saf/amf/amfd/app.cc|  24 +++---
   osaf/services/saf/amf/amfd/cluster.cc|   6 +-
   osaf/services/saf/amf/amfd/comp.cc   |  36 --
   osaf/services/saf/amf/amfd/imm.cc|  41 +
   osaf/services/saf/amf/amfd/include/imm.h |   3 +
   osaf/services/saf/amf/amfd/ndproc.cc |  51 +++-
   osaf/services/saf/amf/amfd/node.cc   |  99 
 +--
   osaf/services/saf/amf/amfd/sg.cc |  87 +++
   osaf/services/saf/amf/amfd/sgproc.cc |  14 +--
   osaf/services/saf/amf/amfd/si.cc |  70 --
   osaf/services/saf/amf/amfd/su.cc |  86 +--
   11 files changed, 281 insertions(+), 236 deletions(-)


 diff --git a/osaf/services/saf/amf/amfd/app.cc 
 b/osaf/services/saf/amf/amfd/app.cc
 --- a/osaf/services/saf/amf/amfd/app.cc
 +++ b/osaf/services/saf/amf/amfd/app.cc
 @@ -357,7 +357,6 @@ static void app_admin_op_cb(SaImmOiHandl
   const SaNameT *object_name, SaImmAdminOperationIdT op_id,
   const SaImmAdminOperationParamsT_2 **params)
   {
 - SaAisErrorT rc;
   AVD_APP *app;

   TRACE_ENTER2(%s, object_name-value);
 @@ -368,28 +367,28 @@ static void app_admin_op_cb(SaImmOiHandl

   if (op_id == SA_AMF_ADMIN_UNLOCK) {
   if (app-saAmfApplicationAdminState == SA_AMF_ADMIN_UNLOCKED) {
 - LOG_ER(%s is already unlocked, object_name-value);
 - rc = SA_AIS_ERR_NO_OP;
 + report_admin_op_error(immOiHandle, invocation, 
 SA_AIS_ERR_NO_OP, NULL,
 + %s is already unlocked, 
 object_name-value);
   goto done;
   }

   if (app-saAmfApplicationAdminState == 
 SA_AMF_ADMIN_LOCKED_INSTANTIATION) {
 - LOG_ER(%s is locked instantiation, 
 object_name-value);
 - rc = SA_AIS_ERR_BAD_OPERATION;
 + report_admin_op_error(immOiHandle, invocation, 
 SA_AIS_ERR_BAD_OPERATION, NULL,
 + %s is locked instantiation, 
 object_name-value);
   goto done;
   }
   }

   if (op_id == SA_AMF_ADMIN_LOCK) {
   if (app-saAmfApplicationAdminState == SA_AMF_ADMIN_LOCKED) {
 - LOG_ER(%s is already locked, object_name-value);
 - rc = SA_AIS_ERR_NO_OP;
 + report_admin_op_error(immOiHandle, invocation, 
 SA_AIS_ERR_NO_OP, NULL,
 + %s is already locked, 
 object_name-value);
   goto done;
   }

   if (app-saAmfApplicationAdminState == 
 SA_AMF_ADMIN_LOCKED_INSTANTIATION) {
 - LOG_ER(%s is locked instantiation, 
 object_name-value);
 - rc = SA_AIS_ERR_BAD_OPERATION;
 + report_admin_op_error(immOiHandle, invocation

Re: [devel] [PATCH 1 of 1] amfd: Add support for admin op result strings [#85]

2013-11-14 Thread Nagendra Kumar

Hi,
Just to inform you that I have not converted all Error cases in this 
patch. 
For example: 
In file sg_2n_fsm.cc: function avd_sg_2n_susi_fail_func():
avd_saImmOiAdminOperationResult(cb-immOiHandle, l_susi-si-invocation, 
SA_AIS_ERR_BAD_OPERATION);

Other places like in sgproc.cc : su_complete_admin_op(i_su, 
SA_AIS_ERR_TIMEOUT); su_disable_comps(i_su, SA_AIS_ERR_TIMEOUT);

Here we don't have any reason explicit, so response will go as usual.

Any comments ?

Thanks
-Nagu

-Original Message-
From: Nagendra Kumar 
Sent: 14 November 2013 14:32
To: hans.fe...@ericsson.com; hans.nordeb...@ericsson.com
Cc: opensaf-devel@lists.sourceforge.net
Subject: [devel] [PATCH 1 of 1] amfd: Add support for admin op result strings 
[#85]

 osaf/services/saf/amf/amfd/app.cc|  24 +++---
 osaf/services/saf/amf/amfd/cluster.cc|   6 +-
 osaf/services/saf/amf/amfd/comp.cc   |  36 --
 osaf/services/saf/amf/amfd/imm.cc|  41 +
 osaf/services/saf/amf/amfd/include/imm.h |   3 +
 osaf/services/saf/amf/amfd/ndproc.cc |  51 +++-
 osaf/services/saf/amf/amfd/node.cc   |  99 +--
 osaf/services/saf/amf/amfd/sg.cc |  87 +++
 osaf/services/saf/amf/amfd/sgproc.cc |  14 +--
 osaf/services/saf/amf/amfd/si.cc |  70 --
 osaf/services/saf/amf/amfd/su.cc |  86 +--
 11 files changed, 281 insertions(+), 236 deletions(-)


diff --git a/osaf/services/saf/amf/amfd/app.cc 
b/osaf/services/saf/amf/amfd/app.cc
--- a/osaf/services/saf/amf/amfd/app.cc
+++ b/osaf/services/saf/amf/amfd/app.cc
@@ -357,7 +357,6 @@ static void app_admin_op_cb(SaImmOiHandl
const SaNameT *object_name, SaImmAdminOperationIdT op_id,
const SaImmAdminOperationParamsT_2 **params)
 {
-   SaAisErrorT rc;
AVD_APP *app;
 
TRACE_ENTER2(%s, object_name-value);
@@ -368,28 +367,28 @@ static void app_admin_op_cb(SaImmOiHandl
 
if (op_id == SA_AMF_ADMIN_UNLOCK) {
if (app-saAmfApplicationAdminState == SA_AMF_ADMIN_UNLOCKED) {
-   LOG_ER(%s is already unlocked, object_name-value);
-   rc = SA_AIS_ERR_NO_OP;
+   report_admin_op_error(immOiHandle, invocation, 
SA_AIS_ERR_NO_OP, NULL,
+   %s is already unlocked, 
object_name-value);
goto done;
}
 
if (app-saAmfApplicationAdminState == 
SA_AMF_ADMIN_LOCKED_INSTANTIATION) {
-   LOG_ER(%s is locked instantiation, 
object_name-value);
-   rc = SA_AIS_ERR_BAD_OPERATION;
+   report_admin_op_error(immOiHandle, invocation, 
SA_AIS_ERR_BAD_OPERATION, NULL,
+   %s is locked instantiation, 
object_name-value);
goto done;
}
}
 
if (op_id == SA_AMF_ADMIN_LOCK) {
if (app-saAmfApplicationAdminState == SA_AMF_ADMIN_LOCKED) {
-   LOG_ER(%s is already locked, object_name-value);
-   rc = SA_AIS_ERR_NO_OP;
+   report_admin_op_error(immOiHandle, invocation, 
SA_AIS_ERR_NO_OP, NULL,
+   %s is already locked, 
object_name-value);
goto done;
}
 
if (app-saAmfApplicationAdminState == 
SA_AMF_ADMIN_LOCKED_INSTANTIATION) {
-   LOG_ER(%s is locked instantiation, 
object_name-value);
-   rc = SA_AIS_ERR_BAD_OPERATION;
+   report_admin_op_error(immOiHandle, invocation, 
SA_AIS_ERR_BAD_OPERATION, NULL,
+   %s is locked instantiation, 
object_name-value);
goto done;
}
}
@@ -409,11 +408,12 @@ static void app_admin_op_cb(SaImmOiHandl
case SA_AMF_ADMIN_UNLOCK_INSTANTIATION:
case SA_AMF_ADMIN_RESTART:
default:
-   rc = SA_AIS_ERR_NOT_SUPPORTED;
+   report_admin_op_error(immOiHandle, invocation, 
SA_AIS_ERR_NOT_SUPPORTED, NULL,
+   Not supported);
break;
}
- done:
-   avd_saImmOiAdminOperationResult(immOiHandle, invocation, rc);
+done:
+   TRACE_LEAVE();
 }
 
 static SaAisErrorT app_rt_attr_cb(SaImmOiHandleT immOiHandle,
diff --git a/osaf/services/saf/amf/amfd/cluster.cc 
b/osaf/services/saf/amf/amfd/cluster.cc
--- a/osaf/services/saf/amf/amfd/cluster.cc
+++ b/osaf/services/saf/amf/amfd/cluster.cc
@@ -177,8 +177,6 @@ static void cluster_admin_op_cb(SaImmOiH
SaInvocationT invocation, const SaNameT *object_name,
SaImmAdminOperationIdT op_id, const SaImmAdminOperationParamsT_2 
**params)
 {
-   SaAisErrorT rc = SA_AIS_OK;
-
switch (op_id) {
case SA_AMF_ADMIN_SHUTDOWN:

Re: [devel] [PATCH 1 of 1] amfd: Add support for admin op result strings [#85]

Re: [devel] [PATCH 1 of 1] amfd: Add support for admin op result strings [#85]

Re: [devel] [PATCH 1 of 1] amfd: Add support for admin op result strings [#85]

Re: [devel] [PATCH 1 of 1] amfd: Add support for admin op result strings [#85]

Re: [devel] [PATCH 1 of 1] amfd: Add support for admin op result strings [#85]

Re: [devel] [PATCH 1 of 1] amfd: Add support for admin op result strings [#85]

Re: [devel] [PATCH 1 of 1] amfd: Add support for admin op result strings [#85]

7 matches

Site Navigation

Mail list logo

Footer information