Hi Hans N,
Thanks for your review. The spaces are above my changes(I mean
not because of the patch, already in the code), which I had noticed, but didn't
correct because it need to be done in refactoring context.
But, I can do it in this patch(in that function only) as per your comment.
Thanks
-Nagu
> -----Original Message-----
> From: Hans Nordebäck [mailto:[email protected]]
> Sent: 12 November 2015 17:37
> To: Nagendra Kumar; Praveen Malviya
> Cc: [email protected]
> Subject: Re: [PATCH 1 of 1] amfd: check for admin state for all nodegroup
> [#1563]
>
> ack, code review only. Minor comment below/Thanks HansN
>
> On 10/30/2015 01:54 PM, [email protected] wrote:
> > osaf/services/saf/amf/amfd/node.cc | 6 ++++--
> > osaf/services/saf/amf/amfd/nodegroup.cc | 4 ++++
> > 2 files changed, 8 insertions(+), 2 deletions(-)
> >
> >
> > Amf is not checking admin state for all the node groups to
> > which a node belongs to during nodegroup unlock-in.
> > Ideally, if one of the nodegroup of a node is in locked-in, Amf
> > shouldn't instantiate the SUs on that node if another nodegroup
> > of that node is being unlocked-in.
> >
> > diff --git a/osaf/services/saf/amf/amfd/node.cc
> b/osaf/services/saf/amf/amfd/node.cc
> > --- a/osaf/services/saf/amf/amfd/node.cc
> > +++ b/osaf/services/saf/amf/amfd/node.cc
> > @@ -1479,8 +1479,10 @@ bool any_ng_in_locked_in_state(const AVD
> > it != nodegroup_db->end(); it++) {
> > AVD_AMF_NG *ng = it->second;
> > if ((node_in_nodegroup(Amf::to_string(&node->name), ng) ==
> true) &&
> > - (ng->saAmfNGAdminState ==
> SA_AMF_ADMIN_LOCKED_INSTANTIATION))
> > - return true;
> [HansN]
> There is a mix of tabs and spaces below.
> > + (ng->saAmfNGAdminState ==
> SA_AMF_ADMIN_LOCKED_INSTANTIATION)) {
> > + TRACE("Nodegroup '%s' is in locked-in", ng-
> >name.value);
> > + return true;
> > + }
> > }
> > return false;
> > }
> > diff --git a/osaf/services/saf/amf/amfd/nodegroup.cc
> b/osaf/services/saf/amf/amfd/nodegroup.cc
> > --- a/osaf/services/saf/amf/amfd/nodegroup.cc
> > +++ b/osaf/services/saf/amf/amfd/nodegroup.cc
> > @@ -892,6 +892,10 @@ static void ng_admin_unlock_inst(AVD_AMF
> > LOG_NO("'%s' UNLOCK_INSTANTIATION: AMF node
> oper state disabled", node->name.value);
> > continue;
> > }
> > + if (any_ng_in_locked_in_state(node) == true) {
> > + LOG_NO("One of the node group of '%s' is in locked-
> in", node->name.value);
> > + continue;
> > + }
> > for (const auto& node_su : node->list_of_su) {
> > /*Instantiate only those SUs in this SG which are
> hosted on the Nodes of NG.
> > Also honor saAmfSURank while instantating.
>
------------------------------------------------------------------------------
Go from Idea to Many App Stores Faster with Intel(R) XDK
Give your users amazing mobile app experiences with Intel(R) XDK.
Use one codebase in this all-in-one HTML5 development environment.
Design, debug & build mobile apps & 2D/3D high-impact games for multiple OSs.
http://pubads.g.doubleclick.net/gampad/clk?id=254741551&iu=/4140
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
