Merge "Pick up version to be included in documentation from right pat…

…h. Also bundle it so it can be accessed at <ip>:8082/documentation/_static/contrail_openapi.json" into R3.2

src/config/api-server/doc/SConscript

@@ -20,10 +20,12 @@ if os.path.exists('/usr/bin/sphinx-apidoc'):
     userdoc_rule = env.Install(Dir('.'), Glob('#controller/src/config/api-server/doc/source/*'))
     schema_rule = env.Install(Dir('.'), Glob('#controller/src/schema/*.xsd'))
     gendoc_rule = env.Install(Dir('.'), env['TOP'] + '/config/api-server/vnc_cfg_api_server/gen/contrail_openapi.rst')
+    openapi_rule = env.Install(Dir('.'), env['TOP'] + '/config/api-server/vnc_cfg_api_server/gen/contrail_openapi.json')
 
     html_gen_rule = env.Command('contrail-config', ['Makefile', 'conf.py'],
                                 'make -C ' + Dir('.').path + ' html') 
-    env.Depends(html_gen_rule, [apidoc_rule, gendoc_rule, userdoc_rule, schema_rule])
+    env.Depends(html_gen_rule,
+        [apidoc_rule, gendoc_rule, userdoc_rule, schema_rule, openapi_rule])
 
 
     doc_sources_rules.append(env.Install("../vnc_cfg_api_server", Dir('.')))

src/config/api-server/doc/source/conf.py

@@ -55,8 +55,8 @@
 # The short X.Y version.
 data = '0.99'
 try:
-    with open ("../../../../../src/base/version.info", "r") as myfile:
-        data=myfile.read().replace('\n', '')
+    with open("../../../../../controller/src/base/version.info", "r") as f:
+        data=f.read().replace('\n', '')
 except:
     pass
 
@@ -132,7 +132,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ['_static', 'contrail_openapi.json']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.