Summary: fix validation of CtCsType [#1302] Review request for Trac Ticket(s): #1302 Peer Reviewer(s): Hans N., Nagendra Pull request to: <<LIST THE PERSON WITH PUSH ACCESS HERE>> Affected branch(es): ALL Development branch: <<IF ANY GIVE THE REPO URL>>
-------------------------------- Impacted area Impact y/n -------------------------------- Docs n Build system n RPM/packaging n Configuration files n Startup scripts n SAF services y OpenSAF services n Core libraries n Samples n Tests n Other n Comments (indicate scope for each "y" above): --------------------------------------------- Note: Patch series one patch (1 of 2) from #986. Patch is included for testing purpose and will not be pusdhed as part of #1302. changeset 3e62c8edc300a383f17f86c6eab2e6bc37d429ca Author: praveen.malv...@oracle.com Date: Thu, 21 May 2015 18:29:51 +0530 amfd: validate CSType when creating CtCsType [#986,#1302] Note: This patch 1 of 2 was floated by Hans F. against the ticket #986. This patch will not be pushed as a part of #1302. AMF allows to create a SaAmfCtCsType object although the SaAmfCSType object referred to does not exist. Fix by looking up the SaAmfCSType DN in the SaAmfCSType database. This patch will protect the creation of invalid SaAmfCtCsType and configuration will not be added into the system. changeset 4850674b73cd5267345d5676290a16aba214807f Author: praveen.malv...@oracle.com Date: Thu, 21 May 2015 18:30:22 +0530 amfd: validate ctcstype relationship while modifying comptype in comp [#1302] Before modifying compType attribute in a comp, one more check on the validity of SaAmfCtCsType is still required which means association (object of SaAmfCtCsType) between this new comptype and cstype in SaAmfCompCsType (in case such an object exists for this component) must also exists in the system. If ctcstype does not exist then there will be problem in deciding components capability for a given cstype. So reject the modify ccb if ctstype does not exist with any cstypes supported by this component via compcstype. Thus assert can be removed as patch 1 and patch 2 will not allow any invalid configuration in the syste. Complete diffstat: ------------------ osaf/services/saf/amf/amfd/comp.cc | 32 ++++++++++++++++++++++++++++++++ osaf/services/saf/amf/amfd/ctcstype.cc | 34 ++++++++++++++++++++++++++++++++++ osaf/services/saf/amf/amfd/imm.cc | 7 ++++--- osaf/services/saf/amf/amfd/include/comp.h | 1 + osaf/services/saf/amf/amfd/include/util.h | 1 + osaf/services/saf/amf/amfd/util.cc | 46 +++++++++++++++++++++++++++++++++++++++++++++- 6 files changed, 117 insertions(+), 4 deletions(-) Testing Commands: ----------------- Tested by trying to modify comptype in a component. Testing, Expected Results: -------------------------- CCB is rejected if ctcstype calidation passes Conditions of Submission: ------------------------- Ack from any reviewer Arch Built Started Linux distro ------------------------------------------- mips n n mips64 n n x86 n n x86_64 y y powerpc n n powerpc64 n n Reviewer Checklist: ------------------- [Submitters: make sure that your review doesn't trigger any checkmarks!] Your checkin has not passed review because (see checked entries): ___ Your RR template is generally incomplete; it has too many blank entries that need proper data filled in. ___ You have failed to nominate the proper persons for review and push. ___ Your patches do not have proper short+long header ___ You have grammar/spelling in your header that is unacceptable. ___ You have exceeded a sensible line length in your headers/comments/text. ___ You have failed to put in a proper Trac Ticket # into your commits. ___ You have incorrectly put/left internal data in your comments/files (i.e. internal bug tracking tool IDs, product names etc) ___ You have not given any evidence of testing beyond basic build tests. Demonstrate some level of runtime or other sanity testing. ___ You have ^M present in some of your files. These have to be removed. ___ You have needlessly changed whitespace or added whitespace crimes like trailing spaces, or spaces before tabs. ___ You have mixed real technical changes with whitespace and other cosmetic code cleanup changes. These have to be separate commits. ___ You need to refactor your submission into logical chunks; there is too much content into a single commit. ___ You have extraneous garbage in your review (merge commits etc) ___ You have giant attachments which should never have been sent; Instead you should place your content in a public tree to be pulled. ___ You have too many commits attached to an e-mail; resend as threaded commits, or place in a public tree for a pull. ___ You have resent this content multiple times without a clear indication of what has changed between each re-send. ___ You have failed to adequately and individually address all of the comments and change requests that were proposed in the initial review. ___ You have a misconfigured ~/.hgrc file (i.e. username, email etc) ___ Your computer have a badly configured date and time; confusing the the threaded patch review. ___ Your changes affect IPC mechanism, and you don't present any results for in-service upgradability test. ___ Your changes affect user manual and documentation, your patch series do not contain the patch that updates the Doxygen manual. ------------------------------------------------------------------------------ One dashboard for servers and applications across Physical-Virtual-Cloud Widest out-of-the-box monitoring support with 50+ applications Performance metrics, stats and reports that give you Actionable Insights Deep dive visibility with transaction tracing using APM Insight. http://ad.doubleclick.net/ddm/clk/290420510;117567292;y _______________________________________________ Opensaf-devel mailing list Opensaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/opensaf-devel