GitHub pull request #3490 of commit a3ae743c78d9997932b3bffb25781567700b903d, no merge conflicts.sha1origin/pr/3490/mergeghprbActualCommita3ae743c78d9997932b3bffb25781567700b903dghprbActualCommitAuthorghprbActualCommitAuthorEmailghprbAuthorRepoGitUrlhttps://github.com/davemarchevsky/bcc.gitghprbTriggerAuthorghprbTriggerAuthorEmailghprbTriggerAuthorLoginyonghong-songghprbTriggerAuthorLoginMention@yonghong-songghprbPullId3490ghprbTargetBranchmasterghprbSourceBranchdavemarchevsky_enum_cleanupGIT_BRANCHdavemarchevsky_enum_cleanupghprbPullAuthorEmaildavemarchevsky@gmail.comghprbPullAuthorLogindavemarchevskyghprbPullAuthorLoginMention@davemarchevskyghprbPullDescriptionGitHub pull request #3490 of commit a3ae743c78d9997932b3bffb25781567700b903d, no merge conflicts.ghprbPullTitlepull out enums from main BPF class to avoid namespace collisionsghprbPullLinkhttps://github.com/iovisor/bcc/pull/3490ghprbPullLongDescriptionIn #3479, the `bpf_attach_type` enum was pulled into the `BPF` class so\r\nthat its members could be used in `attach_func` and `detach_func`\r\nfunctions introduced to the Python API.\r\n\r\nUnfortunately this caused a redefinition of BPF.XDP, which was similarly\r\npulled in from `bpf_prog_type` enum, thus breaking program loading\r\n(#3489).\r\n\r\nLet's pull these enum- and flag-type class variables out into their own\r\nwrapper classes. For backwards compatibility, keep them all (except for\r\n`bpf_attach_type`, which was merged 2 days ago) defined in the BPF\r\nclass, but add a comment to not continue doing this.ghprbCommentBody[buildbot, ok to test]ghprbGhRepositoryiovisor/bccghprbCredentialsId6d3daf13-69b8-48b1-9c8f-ec5353264113false<a title="pull out enums from main BPF class to avoid namespace collisions" href="https://github.com/iovisor/bcc/pull/3490">PR #3490</a>: pull out enums from main BP...#103812354827460664bcc-pr #10381038false10388313SUCCESS1623810735682https://buildbot.iovisor.org/jenkins/user/jmarchan/my-views/view/all/job/bcc-pr/1038/git1038https://buildbot.iovisor.org/jenkins/user/jmarchan/my-views/view/all/job/bcc-pr/label=fc25/1038/1038https://buildbot.iovisor.org/jenkins/user/jmarchan/my-views/view/all/job/bcc-pr/label=fc26/1038/1038https://buildbot.iovisor.org/jenkins/user/jmarchan/my-views/view/all/job/bcc-pr/label=fc27/1038/1038https://buildbot.iovisor.org/jenkins/user/jmarchan/my-views/view/all/job/bcc-pr/label=fc28/1038/1038https://buildbot.iovisor.org/jenkins/user/jmarchan/my-views/view/all/job/bcc-pr/label=ubuntu1604/1038/1038https://buildbot.iovisor.org/jenkins/user/jmarchan/my-views/view/all/job/bcc-pr/label=ubuntu1710/1038/1038https://buildbot.iovisor.org/jenkins/user/jmarchan/my-views/view/all/job/bcc-pr/label=ubuntu1804/1038/