Stop hard coding core team member lists

All of the project json files had lists of the core review team
members.  Since this was originally written, gerrit has added a REST
API and this information is available through that API.  Get the info
from there instead when we can.

There are a few project files I didn't convert because the equivalent
gerrit team wasn't immediately obvious.

Change-Id: Ie7ae19d9a58a5148002676604fd6962ea1438786
Signed-off-by: Russell Bryant <rbryant@redhat.com>

genresults-reviewers.sh

@@ -16,6 +16,10 @@ if [ -n "${GERRIT_USER}" ] ; then
 	EXTRA_ARGS="-u ${GERRIT_USER}"
 fi
 
+if [ -n "${GERRIT_PASS}" ] ; then
+	EXTRA_ARGS="-P ${GERRIT_PASS}"
+fi
+
 if [ -n "${GERRIT_KEY}" ] ; then
 	EXTRA_ARGS="${EXTRA_ARGS} -k ${GERRIT_KEY}"
 fi

projects/barbican.json

@@ -4,10 +4,5 @@
     "subprojects": [
         "stackforge/barbican"
     ],
-    "core-team": [
+    "core-team-gerrit-group": "barbican-core"
-        "dougmendizabal",
-        "woodster",
-        "reaperhulk",
-        "john.vrbanac"
-    ]
 }

projects/ceilometer.json

@@ -1 +1,8 @@
-{"name": "ceilometer", "subprojects": ["openstack/ceilometer", "openstack/python-ceilometerclient"], "core-team": ["jdanjou", "doug-hellmann", "chungg", "lianhao-lu", "asalkeld", "eglynn", "nijaba", "corvus", "ildikov", "nprivalova"]}
+{
+    "name": "ceilometer",
+    "subprojects": [
+        "openstack/ceilometer",
+        "openstack/python-ceilometerclient"
+    ],
+    "core-team-gerrit-group": "ceilometer-core"
+}

projects/cinder.json

@@ -1 +1,9 @@
-{"name": "cinder", "subprojects": ["openstack/cinder", "openstack/python-cinderclient", "openstack/volume-api"], "core-team": ["john-griffith", "avishay-il", "zhiteng-huang", "eharney", "duncan-thomas", "thingee", "walter-boring", "jdurgin", "jsbryant"]}
+{
+    "name": "cinder",
+    "subprojects": [
+        "openstack/cinder",
+        "openstack/python-cinderclient",
+        "openstack/volume-api"
+    ],
+    "core-team-gerrit-group": "cinder-core"
+}

projects/devstack.json

@@ -1,15 +1,5 @@
 {
     "name": "devstack",
     "subprojects": ["openstack-dev/devstack"],
-    "core-team": [
+    "core-team-gerrit-group": "devstack-core"
-        "sdague",
-        "dtroyer",
-        "garyk",
-        "danwent",
-        "anotherjesse",
-        "vishvananda",
-        "corvus",
-        "bcwaldon",
-        "termie"
-    ]
 }

projects/docs-specs.json

@@ -3,10 +3,5 @@
     "subprojects": [
         "openstack/docs-specs"
     ],
-    "core-team": [
+    "core-team-gerrit-group": "openstack-doc-specs-core"
-        "annegentle",
-        "bdpayne",
-        "jaegerandi",
-        "sroberts"
-    ]
 }

projects/docs.json

@@ -7,21 +7,5 @@
         "openstack/openstack-doc-tools",
         "openstack/openstackdocstheme"
     ],
-    "core-team": [
+    "core-team-gerrit-group": "openstack-doc-core"
-        "Alexander",
-        "annegentle",
-        "bdpayne",
-        "berendt",
-        "diane-fleming",
-        "fifieldt",
-        "gpocentek",
-        "ionosphere80",
-        "jaegerandi",
-        "loquacity",
-        "mzlatkova",
-        "Olga",
-        "sgordon",
-        "shillasaebi",
-        "slong"
-    ]
 }

projects/fuel.json

@@ -11,16 +11,5 @@
         "stackforge/fuel-ostf",
         "stackforge/fuel-provision"
     ],
-    "core-team": [
+    "core-team-gerrit-group": "fuel-core"
-        "mihgen",
-        "NastyaUrlapova",
-        "evgeniyl",
-        "aleksey",
-        "r0mikiam",
-        "vkramskikh",
-        "aglarendil",
-        "dpyzhov",
-        "tatyana-leontovich",
-        "angdraug"
-    ]
 }

projects/glance.json

@@ -1 +1,9 @@
-{"name": "glance", "subprojects": ["openstack/glance", "openstack/python-glanceclient", "openstack/image-api"], "core-team": ["markwash", "bcwaldon", "eglynn", "dan-prince", "flaper87", "alex-meade", "jbresnah", "iccha-sethi", "flwang", "lzy-dev"]}
+{
+    "name": "glance",
+    "subprojects": [
+        "openstack/glance",
+        "openstack/python-glanceclient",
+        "openstack/image-api"
+    ],
+    "core-team-gerrit-group": "glance-core"
+}

projects/grenade.json

@@ -1,8 +1,5 @@
 {
     "name": "grenade",
     "subprojects": ["openstack-dev/grenade"],
-    "core-team": [
+    "core-team-gerrit-group": "grenade-core"
-        "sdague",
-        "dtroyer"
-    ]
 }

projects/heat.json

@@ -6,18 +6,5 @@
         "openstack/heat-cfntools",
         "openstack/python-heatclient"
     ],
-    "core-team": [
+    "core-team-gerrit-group": "heat-core"
-        "asalkeld",
-        "huangtianhua",
-        "jbd",
-        "pshchelo",
-        "randall-burt",
-        "steve-stevebaker",
-        "shardy",
-        "skraynev",
-        "tengqm",
-        "therve",
-        "thomasspatzier",
-        "zaneb"
-    ]
 }

projects/horizon.json

@@ -4,18 +4,5 @@
         "openstack/horizon",
         "openstack/tripleo-ui"
     ],
-    "core-team": [
+    "core-team-gerrit-group": "horizon-core"
-        "akrivoka",
-        "amotoki",
-        "clu-m",
-        "david-lyle",
-        "jpichon",
-        "lin-hua-cheng",
-        "mrunge",
-        "niu-zglinux",
-        "thesheep",
-        "tmazur",
-        "tqtran",
-        "ttrifonov"
-    ]
 }

projects/infra.json

@@ -115,12 +115,6 @@
     "openstack-infra/zuul",
     "openstack-infra/zuul-packaging",
     "openstack/openstack-planet"
-], "core-team": [
+],
-    "cboylan",
+    "core-team-gerrit-group": "infra-core"
-    "corvus",
+}
-    "fungi",
-    "jhesketh",
-    "lyz",
-    "mordred",
-    "slukjanov"
-]}

projects/ironic-discoverd.json

@@ -1,7 +1,7 @@
-{"name": "ironic-discoverd", "subprojects": [
+{
-    "stackforge/ironic-discoverd"
+    "name": "ironic-discoverd",
-], "core-team": [
+    "subprojects": [
-    "lucasagomes",
+        "stackforge/ironic-discoverd"
-    "ifarkas",
+    ],
-    "dtantsur"
+    "core-team-gerrit-group": "ironic-discoverd-core"
-]}
+}

projects/ironic-specs.json

@@ -1,10 +1,7 @@
-{"name": "ironic-specs", "subprojects": [
+{
-    "openstack/ironic-specs"
+    "name": "ironic-specs",
-], "core-team": [
+    "subprojects": [
-    "devananda",
+        "openstack/ironic-specs"
-    "nobodycam",
+    ],
-    "lucasagomes",
+    "core-team-gerrit-group": "ironic-specs-core"
-    "dtantsur",
+}
-    "JayF",
-    "jimrollenhagen"
-]}

projects/ironic.json

@@ -1,17 +1,9 @@
-{"name": "ironic", "subprojects": [
+{
-    "openstack/ironic",
+    "name": "ironic",
-    "openstack/python-ironicclient",
+    "subprojects": [
-    "openstack/ironic-python-agent"
+        "openstack/ironic",
-], "core-team": [
+        "openstack/python-ironicclient",
-    "devananda",
+        "openstack/ironic-python-agent"
-    "lucasagomes",
+    ],
-    "nobodycam",
+    "core-team-gerrit-group": "ironic-core"
-    "JayF",
+}
-    "jimrollenhagen",
-    "rloo",
-    "yuriyz",
-    "whaom",
-    "dtantsur",
-    "dshrews",
-    "JoshNang"
-]}

projects/jjb.json

@@ -1,12 +1,7 @@
-{"name": "jjb", "subprojects": [
+{
-    "openstack-infra/jenkins-job-builder"
+    "name": "jjb",
-], "core-team": [
+    "subprojects": [
-    "arnaud.fabre",
+        "openstack-infra/jenkins-job-builder"
-    "cboylan",
+    ],
-    "corvus",
+    "core-team-gerrit-group": "jenkins-job-builder-core"
-    "fungi",
+}
-    "hashar",
-    "mgagne",
-    "mordred",
-    "zaro0508"
-]}

projects/keystone.json

@@ -9,18 +9,6 @@
         "openstack/python-keystoneclient-kerberos",
         "openstack/identity-api"
     ],
-    "core-team": [
+    "core-team-gerrit-group": "keystone-core"
-        "ayoung",
-        "blk-u",
-        "dolph",
-        "dstanek",
-        "guang-yee",
-        "henry-nash",
-        "jamielennox",
-        "ldbragst",
-        "marek-denis",
-        "mdrnstm",
-        "stevemar"
-    ]
 }
 

projects/magnetodb.json

@@ -4,9 +4,5 @@
     "subprojects": [
         "stackforge/magnetodb"
     ],
-    "core-team": [
+    "core-team-gerrit-group": "magnetodb-core"
-        "isviridov",
-        "dukhlov",
-        "ikhudoshyn"
-    ]
 }

projects/mistral.json

@@ -6,7 +6,5 @@
         "stackforge/mistral-extra",
         "stackforge/python-mistralclient"
     ],
-    "core-team": [
+    "core-team-gerrit-group": "mistral-core"
-        "rakhmerov"
-    ]
 }

projects/murano.json

@@ -9,11 +9,5 @@
         "stackforge/murano-docs",
         "stackforge/python-muranoclient"
     ],
-    "core-team": [
+    "core-team-gerrit-group": "murano-core"
-        "ativelkov",
-        "dteselkin",
-        "tsufiev",
-        "istalker2",
-        "ruhe"
-    ]
 }

projects/neutron.json

@@ -9,20 +9,5 @@
         "openstack/netconn-api",
         "openstack/neutron-specs"
     ],
-    "core-team": [
+    "core-team-gerrit-group": "neutron-core"
-        "arosen",
-        "amotoki",
-        "armando-migliaccio",
-        "carl-baldwin",
-        "dougw",
-        "emagana",
-        "garyk",
-        "HenryG",
-        "kevinbenton",
-        "markmcclain",
-        "maru",
-        "mestery",
-        "obondarev",
-        "salvatore-orlando"
-    ]
 }

projects/nova-specs.json

@@ -3,12 +3,5 @@
     "subprojects": [
         "openstack/nova-specs"
     ],
-    "core-team": [
+    "core-team-gerrit-group": "nova-specs-core"
-        "alaski",
-        "berrange",
-        "danms",
-        "jogo",
-        "johngarbutt",
-        "mikalstill"
-    ]
 }

projects/nova.json

@@ -6,21 +6,6 @@
         "openstack/python-novaclient",
         "openstack/compute-api"
     ],
-    "core-team": [
+    "core-team-gerrit-group": "nova-core",
-        "alaski",
-        "berrange",
-        "cerberus",
-        "danms",
-        "jaypipes",
-        "jogo",
-        "johngarbutt",
-        "klmitch",
-        "mikalstill",
-        "melwitt",
-        "mriedem",
-        "ndipanov",
-        "oomichi",
-        "sdague"
-    ],
     "lp_projects": ["nova", "python-novaclient"]
 }

projects/oslo.json

@@ -22,16 +22,5 @@
         "openstack/taskflow",
         "openstack/requirements"
     ],
-    "core-team": [
+    "core-team-gerrit-group": "oslo-core"
-        "bnemec",
-        "dims-v",
-        "doug-hellmann",
-        "flaper87",
-        "haypo",
-        "jdanjou",
-        "markmc",
-        "mikalstill",
-        "russellb",
-        "zyluo"
-    ]
 }

projects/oslo.messaging.json

@@ -3,15 +3,5 @@
     "subprojects": [
         "openstack/oslo.messaging"
     ],
-    "core-team": [
+    "core-team-gerrit-group": "oslo-messaging-core"
-        "bnemec",
-        "dims-v",
-        "doug-hellmann",
-        "flaper87",
-        "jdanjou",
-        "markmc",
-        "mikalstill",
-        "russellb",
-        "zyluo"
-    ]
 }

projects/qa-specs.json

@@ -1,15 +1,5 @@
 {
     "name": "qa-specs",
     "subprojects": ["openstack/qa-specs"],
-    "core-team": [
+    "core-team-gerrit-group": "qa-specs-core"
-        "afazekas",
-        "cyeoh-0",
-        "andrea-frittoli",
-        "david-kranz",
-        "igawa",
-        "mkoderer",
-        "oomichi",
-        "treinish",
-        "sdague"
-    ]
 }

projects/requirements.json

@@ -1,24 +1,8 @@
-{"name": "requirements", "subprojects": [
+{
-    "openstack/requirements"
+    "name": "requirements",
-], "core-team": [
+    "subprojects": [
-    "alex_gaynor",
+        "openstack/requirements"
-    "cboylan",
+    ],
-    "corvus",
+    "core-team-gerrit-group": "requirements-core"
-    "dan-prince",
+}
-    "davewalker",
-    "doug-hellmann",
-    "ewindisch",
-    "fungi",
-    "gabriel-hurley",
-    "ghe.rivero",
-    "heckj",
-    "jdanjou",
-    "markmc",
-    "markmcclain",
-    "mordred",
-    "sdague",
-    "slukjanov",
-    "ttx",
-    "zulcss"
-]}
 

projects/rubick.json

@@ -4,8 +4,5 @@
     "subprojects": [
         "stackforge/rubick"
     ],
-    "core-team": [
+    "core-team-gerrit-group": "rubick-core"
-        "mkulkin",
-        "gelbuhos"
-    ]
 }

projects/sahara.json

@@ -8,14 +8,5 @@
         "openstack/sahara-image-elements",
         "stackforge/puppet-sahara"
     ],
-    "core-team": [
+    "core-team-gerrit-group": "sahara-core"
-        "slukjanov",
-        "aignatov",
-        "farrellee",
-        "jspeidel",
-        "alazarev",
-        "tmckay",
-        "mimccune",
-        "sreshetniak"
-    ]
 }

projects/security-doc.json

@@ -3,13 +3,5 @@
     "subprojects": [
         "openstack/security-doc"
     ],
-    "core-team": [
+    "core-team-gerrit-group": "security-doc-core"
-        "annegentle",
-        "bdpayne",
-        "berendt",
-        "hyakuhei",
-        "jaegerandi",
-        "sicarie",
-        "nkinder"
-    ]
 }

projects/solum.json

@@ -5,13 +5,5 @@
         "stackforge/solum",
         "stackforge/python-solumclient"
     ],
-    "core-team": [
+    "core-team-gerrit-group": "solum-core"
-        "aotto",
-        "lifeless",
-        "noorul",
-        "asalkeld",
-        "devdatta-kulkarni",
-        "gokrokve",
-        "julienvey"
-    ]
 }

projects/stable.json

@@ -12,31 +12,5 @@
         "openstack/neutron",
         "openstack/horizon"
     ],
-    "core-team": [
+    "core-team-gerrit-group": "stable-maint-core"
-        "arosen",
-        "gandelman-a",
-        "apevec",
-        "zulcss",
-        "danms",
-        "davewalker",
-        "david-lyle",
-        "dolph",
-        "doug-hellmann",
-        "eglynn",
-        "flaper87",
-        "gabriel-hurley",
-        "john-griffith",
-        "jdanjou",
-        "markmc",
-        "markwash",
-        "treinish",
-        "mrunge",
-        "russellb",
-        "stevebaker",
-        "shardy",
-        "vishvananda",
-        "garyk",
-        "markmcclain",
-        "p-draigbrady"
-    ]
 }

projects/storyboard.json

@@ -4,12 +4,5 @@
         "openstack-infra/storyboard",
         "openstack-infra/storyboard-webclient"
     ],
-    "core-team": [
+    "core-team-gerrit-group": "storyboard-core"
-        "ttx",
-        "cboylan",
-        "fungi",
-        "corvus",
-        "mordred",
-        "krotscheck"
-    ]
 }

projects/swift.json

@@ -1 +1,9 @@
-{"name": "swift", "subprojects": ["openstack/swift", "openstack/python-swiftclient", "openstack/swift-bench"], "core-team": ["darrellb", "torgomatic", "notmyname", "clay-gerrard", "david-goetz", "redbo", "greglange", "zaitcev", "acoles", "peluse", "mattoliverau", "cschwede"]}
+{
+    "name": "swift",
+    "subprojects": [
+        "openstack/swift",
+        "openstack/python-swiftclient",
+        "openstack/swift-bench"
+    ],
+    "core-team-gerrit-group": "swift-core"
+}

projects/taskflow.json

@@ -3,12 +3,5 @@
     "subprojects": [
         "openstack/taskflow"
     ],
-    "core-team": [
+    "core-team-gerrit-group": "taskflow-core"
-        "doug-hellmann",
-        "changbl",
-        "imelnikov",
-        "harlowja",
-        "pran1990",
-        "dankrause"
-    ]
 }

projects/tempest.json

@@ -1,15 +1,5 @@
 {
     "name": "tempest",
     "subprojects": ["openstack/tempest"],
-    "core-team": [
+    "core-team-gerrit-group": "tempest-core"
-        "afazekas",
-        "cyeoh-0",
-        "andrea-frittoli",
-        "david-kranz",
-        "igawa",
-        "mkoderer",
-        "oomichi",
-        "treinish",
-        "sdague"
-    ]
 }

projects/training-guides.json

@@ -3,11 +3,5 @@
     "subprojects": [
         "openstack/training-guides"
     ],
-    "core-team": [
+    "core-team-gerrit-group": "openstack-training-guides-core"
-        "colinmcnamara",
-        "dguitarbite",
-        "rluethi",
-        "matjazp",
-        "seanrob"
-    ]
 }

projects/tripleo.json

@@ -15,29 +15,9 @@
     "openstack/tripleo-incubator",
     "openstack/tripleo-specs",
     "openstack/tuskar"
-], "core-team": [
+],
-    "bnemec",
+    "core-team-gerrit-group": "tripleo-core",
-    "clint-fewbar",
+"lp_projects": [
-    "cmsj",
-    "derekh",
-    "dan-prince",
-    "ghe.rivero",
-    "greghaynes",
-    "jdob",
-    "jistr",
-    "jonpaul-sullivan",
-    "jprovazn",
-    "lsmola",
-    "lxsli",
-    "marios",
-    "mtaylor",
-    "pblaho",
-    "rdopieralski",
-    "slagle",
-    "stevenk",
-    "tchaypo",
-    "tomas-8c8"
-], "lp_projects": [
     "diskimage-builder",
     "os-apply-config",
     "os-cloud-config",

projects/trove.json

@@ -6,15 +6,5 @@
         "openstack/trove-specs",
         "openstack/python-troveclient"
     ],
-    "core-team": [
+    "core-team-gerrit-group": "trove-core"
-        "amcreynolds",
-        "amrith",
-        "cp16net",
-        "ekotowski",
-        "iccha-sethi",
-        "peterstac",
-        "slicknik",
-        "vipuls",
-        "vkmc"
-    ]
 }

requirements.txt

@@ -4,4 +4,5 @@ pbr>=0.5.21,<1.0
 prettytable
 Babel>=1.3
 pytz>=2010h
+requests>=2.2.0,!=2.4.0
 six>=1.7.0

reviewstats/cmd/reviewers.py

@@ -47,7 +47,7 @@ def set_defaults(reviewer, reviewers):
     reviewers[reviewer].setdefault('received', 0)
 
 
-def process_patchset(project, patchset, reviewers, ts):
+def process_patchset(project, patchset, reviewers, ts, options):
     latest_core_neg_vote = 0
     latest_core_pos_vote = 0
 
@@ -58,7 +58,8 @@ def process_patchset(project, patchset, reviewers, ts):
             # Only count code reviews.  Don't add another for Approved, which
             # is type 'Approved' or 'Workflow'
             continue
-        core_team = utils.get_core_team(project)
+        core_team = utils.get_core_team(project, options.server, options.user,
+                options.password)
         if review['by'].get('username', 'unknown') not in core_team:
             # Only checking for disagreements from core team members
             continue
@@ -170,7 +171,8 @@ def write_pretty(reviewer_data, file_obj, options, reviewers, projects,
             if num_reviewers else 0))
     file_obj.write('Total reviews by core team: %d (%.1f/day)\n' % (
         totals['core'], float(totals['core']) / options.days))
-    core_team_size = sum([len(utils.get_core_team(project))
+    core_team_size = sum([len(utils.get_core_team(project, options.server,
+        options.user, options.password))
                           for project in projects])
     file_obj.write('Core team size: %d (avg %.1f reviews/day)\n' % (
                    core_team_size,
@@ -253,6 +255,9 @@ def main(argv=None):
         help='Number of days to consider')
     optparser.add_option(
         '-u', '--user', default=getpass.getuser(), help='gerrit user')
+    optparser.add_option(
+        '-P', '--password', default=getpass.getuser(),
+        help='gerrit HTTP password')
     optparser.add_option(
         '-k', '--key', default=None, help='ssh key for gerrit')
     optparser.add_option(
@@ -297,7 +302,7 @@ def main(argv=None):
             patch_for_change = False
             first_patchset = True
             for patchset in change.get('patchSets', []):
-                process_patchset(project, patchset, reviewers, ts)
+                process_patchset(project, patchset, reviewers, ts, options)
                 age = utils.get_age_of_patch(patchset, now_ts)
                 if (now_ts - age) > ts:
                     change_stats['patches'] += 1
@@ -326,7 +331,8 @@ def main(argv=None):
     for k, v in reviewers:
         in_core_team = False
         for project in projects:
-            if v in utils.get_core_team(project):
+            if v in utils.get_core_team(project, options.server, options.user,
+                    options.password):
                 in_core_team = True
                 break
         name = '%s%s' % (v, ' **' if in_core_team else '')

reviewstats/utils.py

@@ -21,6 +21,8 @@ import glob
 import json
 import logging
 import os
+import requests
+import requests.auth
 from six.moves import cPickle as pickle
 import time
 
@@ -297,5 +299,36 @@ def get_age_of_patch(patch, now_ts):
         return now_ts - patch['createdOn']
 
 
-def get_core_team(project):
+TEAM_MEMBERS = {}
-    return project['core-team']
+
+
+def get_team_members(team_name, server, user, pw):
+    global TEAM_MEMBERS
+    if team_name in TEAM_MEMBERS:
+        return TEAM_MEMBERS[team_name]
+    auth = requests.auth.HTTPDigestAuth(user, pw)
+    groups_request = requests.get('http://%s/a/groups/' % server, auth=auth)
+    if groups_request.status_code != 200:
+        raise Exception('Please provide your Gerrit HTTP Password.')
+    text = groups_request.text
+    teams = json.loads(text[text.find('{'):])
+    text = requests.get('http://%s/a/groups/%s/detail' % (server,
+                        teams[team_name]['id']), auth=auth).text
+    team = json.loads(text[text.find('{'):])
+    members_list = [n['username'] for n in team['members']]
+    if 'hudson-openstack' in members_list:
+        # This is a review.openstack.org specific hack.  This user is
+        # automatically included in core teams, but we don't want to include it
+        # in the stats.
+        members_list.remove('hudson-openstack')
+    TEAM_MEMBERS[team_name] = members_list
+    return members_list
+
+
+def get_core_team(project, server, user, pw):
+    if 'core-team' in project:
+        return project['core-team']
+    if 'core-team-gerrit-group' in project:
+        return get_team_members(project['core-team-gerrit-group'],
+                                server, user, pw)
+    return []