autohelp: updated to handle juno

The latest patches have broken the diff_branches script because we lost
compatibility with pre-kilo releases. This patch restores support for
juno.

Change-Id: I8b4067ca925fe4ef39d9853020f28b100054e2db

autogenerate_config_docs/autohelp-wrapper

@@ -136,11 +136,12 @@ if [ "$FAST" -eq 0 ] ; then
     get_project oslo-incubator
     get_project openstack-manuals
 
+    release=$(echo $BRANCH | sed 's,^stable.,,')
     for project in $PROJECTS; do
         setup_venv $project
         setup_tools
-        if [ -e requirements/$project.txt ]; then
-            pip install -r requirements/$project.txt \
+        if [ -e requirements/$project-$release.txt ]; then
+            pip install -r requirements/$project-$release.txt \
                 --allow-all-external
         fi
         get_project $project

autogenerate_config_docs/diff_branches.py

@@ -65,7 +65,9 @@ def get_options(project, branch, args):
 
     # And run autohelp script to get a serialized dict of the discovered
     # options
-    dirname = os.path.abspath(os.path.join('venv', branch.replace('/', '_')))
+    dirname = os.path.abspath(os.path.join('venv',
+                                           branch.replace('/', '_'),
+                                           project))
     if project == 'swift':
         cmd = ("python extract_swift_flags.py dump "
                "-s %(sources)s/swift -m %(sources)s/openstack-manuals" %

autogenerate_config_docs/hooks.py

@@ -36,17 +36,21 @@ def glance_store_config():
 
 
 def neutron_misc():
-    import bsnstacklib.plugins.bigswitch.config
-    import networking_cisco.plugins.cisco.cfg_agent.device_status  # noqa
-    import networking_l2gw.services.l2gateway.common.config as l2gw
-    import networking_vsphere.common.config
-    from oslo_config import cfg
-    import vmware_nsx.neutron.plugins.vmware.common.config  # noqa
+    try:
+        # These imports are needed for kilo only
+        import bsnstacklib.plugins.bigswitch.config
+        import networking_cisco.plugins.cisco.cfg_agent.device_status  # noqa
+        import networking_l2gw.services.l2gateway.common.config as l2gw
+        import networking_vsphere.common.config
+        from oslo_config import cfg
+        import vmware_nsx.neutron.plugins.vmware.common.config  # noqa
 
-    bsnstacklib.plugins.bigswitch.config.register_config()
-    networking_vsphere.common.config.register_options()
-    l2gw.register_l2gw_opts_helper()
-    l2gw.register_ovsdb_opts_helper(cfg.CONF)
+        bsnstacklib.plugins.bigswitch.config.register_config()
+        networking_vsphere.common.config.register_options()
+        l2gw.register_l2gw_opts_helper()
+        l2gw.register_ovsdb_opts_helper(cfg.CONF)
+    except Exception:
+        pass
 
 
 def nova_spice():

autogenerate_config_docs/requirements/neutron-juno.txt

@@ -0,0 +1 @@
+ryu

autogenerate_config_docs/requirements/neutron-kilo.txt

@@ -0,0 +1,34 @@
+ryu
+# for vmware
+-e git://git.openstack.org/openstack/nova.git@stable/kilo#egg=nova
+
+# for a bunch of plugins
+-e git://git.openstack.org/openstack/neutron.git@stable/kilo#egg=neutron
+-e git://git.openstack.org/openstack/neutron-lbaas.git@stable/kilo#egg=neutron-lbaas
+
+# for midonet
+-e git://github.com/midonet/python-midonetclient.git#egg=midonetclient
+
+-e git+https://git.openstack.org/stackforge/networking-arista.git@stable/kilo#egg=networking-arista
+-e git+https://git.openstack.org/stackforge/networking-bagpipe-l2.git@master#egg=networking-bagpipe-l2
+-e git+https://git.openstack.org/stackforge/networking-bgpvpn.git@master#egg=networking-bgpvpn
+-e git+https://git.openstack.org/stackforge/networking-bigswitch.git@master#egg=networking-bigswitch
+-e git+https://git.openstack.org/stackforge/networking-brocade.git@master#egg=networking-brocade
+-e git+https://git.openstack.org/stackforge/networking-cisco.git@stable/kilo#egg=networking-cisco
+-e git+https://git.openstack.org/stackforge/networking-edge-vpn.git@master#egg=networking-edge-vpn
+-e git+https://git.openstack.org/stackforge/networking-hyperv.git@master#egg=networking-hyperv
+-e git+https://git.openstack.org/stackforge/networking-ibm.git@master#egg=networking-ibm
+-e git+https://git.openstack.org/stackforge/networking-l2gw.git@master#egg=networking-l2gw
+# pip dependency installation failure
+-e git+https://git.openstack.org/stackforge/networking-midonet.git@master#egg=networking-midonet
+-e git+https://git.openstack.org/stackforge/networking-mlnx.git@master#egg=networking-mlnx
+-e git+https://git.openstack.org/stackforge/networking-nec.git@stable/kilo#egg=networking-nec
+-e git+https://git.openstack.org/stackforge/networking-odl.git@master#egg=networking-odl
+-e git+https://git.openstack.org/stackforge/networking-ofagent.git@master#egg=networking-ofagent
+-e git+https://git.openstack.org/stackforge/networking-ovn.git@master#egg=networking-ovn
+-e git+https://git.openstack.org/stackforge/networking-ovs-dpdk.git@stable/kilo#egg=networking-ovs-dpdk
+-e git+https://git.openstack.org/stackforge/networking-plumgrid.git@master#egg=networking-plumgrid
+-e git+https://git.openstack.org/stackforge/networking-portforwarding.git@master#egg=networking-portforwarding
+-e git+https://git.openstack.org/stackforge/networking-vsphere.git@master#egg=networking-vsphere
+-e git+https://git.openstack.org/stackforge/neutron-powervm.git@master#egg=neutron-powervm
+-e git+https://git.openstack.org/stackforge/vmware-nsx.git#egg=vmware-nsx