Merge "Add helm & k8s versions for casablanca"

diff --git a/docs/release/index.rst b/docs/release/index.rst
index a98bd91..1f48857 100644 (file)
--- a/docs/release/index.rst
+++ b/docs/release/index.rst
@@ -6,14 +6,14 @@
 
 .. index:: Release Notes
 
-Beijing Release Notes
-^^^^^^^^^^^^^^^^^^^^^
-This page is the ONAP Beijing Release Notes. The first release was
-Amsterdam and subsequent major release will be named using city names.
+Casablanca Release Notes
+^^^^^^^^^^^^^^^^^^^^^^^^
+This page is the ONAP Casablanca Release Notes. The first release was labelled
+Amsterdam, second release Beijing and subsequent major release will be named using city names.
 
-* Release Name: Beijing
-* Release Version: 2.0.0
-* Release Date: June 7, 2018
+* Release Name: Casablanca
+* Release Version: 3.0.0
+* Release Date: Nov xx, 2018
 
 
 Getting Started With ONAP
@@ -128,7 +128,7 @@ There are 3 approaches to install ONAP:
 
 Documentation
 =============
-ONAP Beijing Release provides multiple documents including the following:
+ONAP Casablanca Release provides multiple documents including the following:
 
  * A high level :ref:`architecture view<doc-architecture>` of how components
    relate to each other.
@@ -147,7 +147,7 @@ ONAP Beijing Release provides multiple documents including the following:
 
 Security Notes
 ==============
-ONAP has adopted the `CII Best Practice Badge Program <https://bestpractices.coreinfrastructure.org/en>`_. The goal of the Beijing release is for all ONAP projects to be close to achieving a CII Passing badge.
+ONAP has adopted the `CII Best Practice Badge Program <https://bestpractices.coreinfrastructure.org/en>`_. The goal of the Casablanca release is for all ONAP projects to be close to achieving a CII Passing badge.
 
 - `Badging Requirements <https://github.com/coreinfrastructure/best-practices-badge#core-infrastructure-initiative-best-practices-badge>`_
 - `Badging Status for all ONAP projects <https://bestpractices.coreinfrastructure.org/en/projects?q=onap>`_

diff --git a/docs/smsummary.rst b/docs/smsummary.rst
new file mode 100644 (file)
index 0000000..13e0e45
--- /dev/null
+++ b/docs/smsummary.rst
@@ -0,0 +1,10 @@
+.. This work is licensed under a Creative Commons Attribution 4.0
+.. International License. http://creativecommons.org/licenses/by/4.0
+.. Copyright 2017 AT&T Intellectual Property.  All rights reserved.
+
+Contributing Submodule Summary
+==============================
+
+.. code-block:: console
+   
+.. literalinclude:: _static/smsummary.out

diff --git a/docs/submodules/aaf/authz.git b/docs/submodules/aaf/authz.git
index 7425da5..8cd88b8 160000 (submodule)
--- a/docs/submodules/aaf/authz.git
+++ b/docs/submodules/aaf/authz.git
@@ -1 +1 @@
-Subproject commit 7425da5594670b182122306c70ef8846f53c175b
+Subproject commit 8cd88b8fbd5cdaa3fe796a11c0788ba202a808a3

diff --git a/docs/submodules/aai/aai-common.git b/docs/submodules/aai/aai-common.git
index 426992d..6edb623 160000 (submodule)
--- a/docs/submodules/aai/aai-common.git
+++ b/docs/submodules/aai/aai-common.git
@@ -1 +1 @@
-Subproject commit 426992d0bf2e3a3d3123bd716960cd33dd20fc39
+Subproject commit 6edb62395a4a18481ff851a218af3e570f085b4e

diff --git a/docs/submodules/aai/esr-gui.git b/docs/submodules/aai/esr-gui.git
index 2b60960..87fa6ad 160000 (submodule)
--- a/docs/submodules/aai/esr-gui.git
+++ b/docs/submodules/aai/esr-gui.git
@@ -1 +1 @@
-Subproject commit 2b609609b666715907dad476b8a1ffaaa6f33989
+Subproject commit 87fa6ad968ad43587e0fde8c346e5e2df1fb4834

diff --git a/docs/submodules/aai/event-client.git b/docs/submodules/aai/event-client.git
index 14eddc2..898e060 160000 (submodule)
--- a/docs/submodules/aai/event-client.git
+++ b/docs/submodules/aai/event-client.git
@@ -1 +1 @@
-Subproject commit 14eddc2cc36b4c64782c7b1ea7a1abd6be1c2f2f
+Subproject commit 898e060c37c2e7734a025dff9db1f733c9e4580f

diff --git a/docs/submodules/aai/sparky-be.git b/docs/submodules/aai/sparky-be.git
index 30643d7..206e44d 160000 (submodule)
--- a/docs/submodules/aai/sparky-be.git
+++ b/docs/submodules/aai/sparky-be.git
@@ -1 +1 @@
-Subproject commit 30643d72ec44dddb06a17d5ad29b0c45e90a445c
+Subproject commit 206e44d57c0b1800abc2faf313a5c0c1b4945a8a

diff --git a/docs/submodules/appc.git b/docs/submodules/appc.git
index 0116717..af2fcc2 160000 (submodule)
--- a/docs/submodules/appc.git
+++ b/docs/submodules/appc.git
@@ -1 +1 @@
-Subproject commit 01167176ce6f6c663055f77ee01cb18793aa8ea5
+Subproject commit af2fcc24fc53bf8bde0e38f2276d702d923c4b80

diff --git a/docs/submodules/appc/deployment.git b/docs/submodules/appc/deployment.git
index cc1af85..791a3ab 160000 (submodule)
--- a/docs/submodules/appc/deployment.git
+++ b/docs/submodules/appc/deployment.git
@@ -1 +1 @@
-Subproject commit cc1af85dc481922d5884777822f25183003c20fa
+Subproject commit 791a3ab6b44c8b2ece29b4db8c4d166e6ffb1a7a

diff --git a/docs/submodules/clamp.git b/docs/submodules/clamp.git
index b0eb298..ac4958a 160000 (submodule)
--- a/docs/submodules/clamp.git
+++ b/docs/submodules/clamp.git
@@ -1 +1 @@
-Subproject commit b0eb2982ff2abccb178d378d9a6a6c9006559b84
+Subproject commit ac4958ae6d30e60c5cf0bd66ce8f3c79191c6726

diff --git a/docs/submodules/dcaegen2.git b/docs/submodules/dcaegen2.git
index 0854090..56f3194 160000 (submodule)
--- a/docs/submodules/dcaegen2.git
+++ b/docs/submodules/dcaegen2.git
@@ -1 +1 @@
-Subproject commit 0854090a69fa3016c33c33beedae7a032fbaf029
+Subproject commit 56f3194910de86e913ab6b0e804655d6e46f7559

diff --git a/docs/submodules/dmaap/buscontroller.git b/docs/submodules/dmaap/buscontroller.git
index 366e5f7..345acec 160000 (submodule)
--- a/docs/submodules/dmaap/buscontroller.git
+++ b/docs/submodules/dmaap/buscontroller.git
@@ -1 +1 @@
-Subproject commit 366e5f722628d21e9fea4d9c105b5518a5637bee
+Subproject commit 345acecaaac8a7670eb8331e1f1356f860db7b60

diff --git a/docs/submodules/dmaap/datarouter.git b/docs/submodules/dmaap/datarouter.git
index 7d8fa29..200d3c8 160000 (submodule)
--- a/docs/submodules/dmaap/datarouter.git
+++ b/docs/submodules/dmaap/datarouter.git
@@ -1 +1 @@
-Subproject commit 7d8fa29803b9d9328106702910e47a4596f84cc9
+Subproject commit 200d3c88c80715dcb5e1b029e28042825bb7de07

diff --git a/docs/submodules/dmaap/dbcapi.git b/docs/submodules/dmaap/dbcapi.git
index 49e0717..87bf924 160000 (submodule)
--- a/docs/submodules/dmaap/dbcapi.git
+++ b/docs/submodules/dmaap/dbcapi.git
@@ -1 +1 @@
-Subproject commit 49e071747146494dc802d09685075f306b27f6a8
+Subproject commit 87bf9245434ad317ea39a84a0099233197f3d7c2

diff --git a/docs/submodules/dmaap/messagerouter/messageservice.git b/docs/submodules/dmaap/messagerouter/messageservice.git
index 9072eeb..f3f0a2c 160000 (submodule)
--- a/docs/submodules/dmaap/messagerouter/messageservice.git
+++ b/docs/submodules/dmaap/messagerouter/messageservice.git
@@ -1 +1 @@
-Subproject commit 9072eeb0cff6005902d0d21b3e5653e284288122
+Subproject commit f3f0a2c774047136c8f580ad811c2e60f6218eac

diff --git a/docs/submodules/holmes/engine-management.git b/docs/submodules/holmes/engine-management.git
index a3950b1..bf652bc 160000 (submodule)
--- a/docs/submodules/holmes/engine-management.git
+++ b/docs/submodules/holmes/engine-management.git
@@ -1 +1 @@
-Subproject commit a3950b1227da2952b60920fec0bd87eef5791005
+Subproject commit bf652bc2ae7362eff1ab0a15b719465b296e4776

diff --git a/docs/submodules/holmes/rule-management.git b/docs/submodules/holmes/rule-management.git
index c066e7d..1b2e3a4 160000 (submodule)
--- a/docs/submodules/holmes/rule-management.git
+++ b/docs/submodules/holmes/rule-management.git
@@ -1 +1 @@
-Subproject commit c066e7d1f7cfbbe74a1e740a939bb268f4a92b3e
+Subproject commit 1b2e3a414826c059557845cbf6fd32eeb095f9b0

diff --git a/docs/submodules/integration.git b/docs/submodules/integration.git
index 5b074b8..4ee737c 160000 (submodule)
--- a/docs/submodules/integration.git
+++ b/docs/submodules/integration.git
@@ -1 +1 @@
-Subproject commit 5b074b87335a98ba08b41f1e89d36f25fd25d798
+Subproject commit 4ee737cff74c52411b1d2f1455e15055f176b7ab

diff --git a/docs/submodules/integration/devtool.git b/docs/submodules/integration/devtool.git
index 5dd0bab..1359ae6 160000 (submodule)
--- a/docs/submodules/integration/devtool.git
+++ b/docs/submodules/integration/devtool.git
@@ -1 +1 @@
-Subproject commit 5dd0bab482f4740dec66f5a1a1e1dc8b4fef2296
+Subproject commit 1359ae6401357c9381c0f0e0cf997a48fb8272d2

diff --git a/docs/submodules/logging-analytics.git b/docs/submodules/logging-analytics.git
index 60de689..8dd149c 160000 (submodule)
--- a/docs/submodules/logging-analytics.git
+++ b/docs/submodules/logging-analytics.git
@@ -1 +1 @@
-Subproject commit 60de689fa4c16807d69646f5604d7ed1042f1dca
+Subproject commit 8dd149c02d9cd8bb794fc3c823a26a1fd1c31b51

diff --git a/docs/submodules/multicloud/framework.git b/docs/submodules/multicloud/framework.git
index 2dfba4b..66b38de 160000 (submodule)
--- a/docs/submodules/multicloud/framework.git
+++ b/docs/submodules/multicloud/framework.git
@@ -1 +1 @@
-Subproject commit 2dfba4b15af4fea7092dae1619cf985013b7a129
+Subproject commit 66b38dea91018952d9070d95dcc29fe510e13a1a

diff --git a/docs/submodules/multicloud/k8s.git b/docs/submodules/multicloud/k8s.git
index 3fec487..b4a5ff6 160000 (submodule)
--- a/docs/submodules/multicloud/k8s.git
+++ b/docs/submodules/multicloud/k8s.git
@@ -1 +1 @@
-Subproject commit 3fec487b6db21303516380dbd7635978164bb8a7
+Subproject commit b4a5ff60af9186f45f64f310d1d615da571c834d

diff --git a/docs/submodules/music.git b/docs/submodules/music.git
index 98e3809..98849e3 160000 (submodule)
--- a/docs/submodules/music.git
+++ b/docs/submodules/music.git
@@ -1 +1 @@
-Subproject commit 98e3809b59399dbe8174d97cdf3367beb475e53a
+Subproject commit 98849e3f37c5d2e04cc961bc5953e7cd055d4304

diff --git a/docs/submodules/oom.git b/docs/submodules/oom.git
index 7586f97..0f282c0 160000 (submodule)
--- a/docs/submodules/oom.git
+++ b/docs/submodules/oom.git
@@ -1 +1 @@
-Subproject commit 7586f977deaa8cb00295545e7de3a537ba113441
+Subproject commit 0f282c08081ea538b1c49159a57eb2766f7372f2

diff --git a/docs/submodules/optf/has.git b/docs/submodules/optf/has.git
index ed7c491..6339274 160000 (submodule)
--- a/docs/submodules/optf/has.git
+++ b/docs/submodules/optf/has.git
@@ -1 +1 @@
-Subproject commit ed7c491c37db044b07ab97781a2d8cab63bcfe99
+Subproject commit 633927402f317714069ae71e0ee766a0d54194ed

diff --git a/docs/submodules/optf/osdf.git b/docs/submodules/optf/osdf.git
index 99be035..b05fb22 160000 (submodule)
--- a/docs/submodules/optf/osdf.git
+++ b/docs/submodules/optf/osdf.git
@@ -1 +1 @@
-Subproject commit 99be035a26a198d676547c9f88c56f1f0c37b697
+Subproject commit b05fb22d90def79369e37f4e08ae19595317421a

diff --git a/docs/submodules/policy/apex-pdp.git b/docs/submodules/policy/apex-pdp.git
index 79e5ede..53d8916 160000 (submodule)
--- a/docs/submodules/policy/apex-pdp.git
+++ b/docs/submodules/policy/apex-pdp.git
@@ -1 +1 @@
-Subproject commit 79e5edea6fdbbab122e280f95cd3f2dbfc431e8b
+Subproject commit 53d8916cc60d97e2ce7ae345f8cc25f5602567da

diff --git a/docs/submodules/policy/engine.git b/docs/submodules/policy/engine.git
index 4a74141..6de77ec 160000 (submodule)
--- a/docs/submodules/policy/engine.git
+++ b/docs/submodules/policy/engine.git
@@ -1 +1 @@
-Subproject commit 4a74141f145c74d4d26a191ea30d34d331feb70e
+Subproject commit 6de77ecc35e8c5333be8d35f0f46ca5679ad8127

diff --git a/docs/submodules/portal.git b/docs/submodules/portal.git
index 9d5f5d6..49d1b71 160000 (submodule)
--- a/docs/submodules/portal.git
+++ b/docs/submodules/portal.git
@@ -1 +1 @@
-Subproject commit 9d5f5d667d21f6929286dbc8dbc2d40c02bc0760
+Subproject commit 49d1b7109c9b7179ce9fd89696fe1ef8025e76a5

diff --git a/docs/submodules/sdc.git b/docs/submodules/sdc.git
index 461e964..3edb71c 160000 (submodule)
--- a/docs/submodules/sdc.git
+++ b/docs/submodules/sdc.git
@@ -1 +1 @@
-Subproject commit 461e964344d01e245464980b6ace12e4b28569e6
+Subproject commit 3edb71cfc640b32a7cea3ee0823350ef19dd7694

diff --git a/docs/submodules/sdc/sdc-docker-base.git b/docs/submodules/sdc/sdc-docker-base.git
index d18094d..36aaff0 160000 (submodule)
--- a/docs/submodules/sdc/sdc-docker-base.git
+++ b/docs/submodules/sdc/sdc-docker-base.git
@@ -1 +1 @@
-Subproject commit d18094dfca7558771c8ac08893b069c0dfd44a23
+Subproject commit 36aaff0eb99184ecb552d14aa44b818308be38ee

diff --git a/docs/submodules/sdc/sdc-tosca.git b/docs/submodules/sdc/sdc-tosca.git
index 66d1cb1..bc0945a 160000 (submodule)
--- a/docs/submodules/sdc/sdc-tosca.git
+++ b/docs/submodules/sdc/sdc-tosca.git
@@ -1 +1 @@
-Subproject commit 66d1cb1f7d6bc97c15871f3d0ddbff202c354dfc
+Subproject commit bc0945a600e11741b86524889740b701297c986f

diff --git a/docs/submodules/sdc/sdc-workflow-designer.git b/docs/submodules/sdc/sdc-workflow-designer.git
index ed8d3be..b2f59dc 160000 (submodule)
--- a/docs/submodules/sdc/sdc-workflow-designer.git
+++ b/docs/submodules/sdc/sdc-workflow-designer.git
@@ -1 +1 @@
-Subproject commit ed8d3bede945e842a2716802272bdf9b24997e27
+Subproject commit b2f59dcd76a7f5fc515b5ad4763121bb95f8c49a

diff --git a/docs/submodules/sdnc/oam.git b/docs/submodules/sdnc/oam.git
index 4960a7a..4e104ac 160000 (submodule)
--- a/docs/submodules/sdnc/oam.git
+++ b/docs/submodules/sdnc/oam.git
@@ -1 +1 @@
-Subproject commit 4960a7a1637d559facd6f71886187692fce867a0
+Subproject commit 4e104ac4183dd46124753c4571939e765a124508

diff --git a/docs/submodules/so.git b/docs/submodules/so.git
index 9390b58..61affc6 160000 (submodule)
--- a/docs/submodules/so.git
+++ b/docs/submodules/so.git
@@ -1 +1 @@
-Subproject commit 9390b58f5e502bfdf5d0127a4cc5b45e12f17cb6
+Subproject commit 61affc6311906aee71b16ee8632c1e7468cd1990

diff --git a/docs/submodules/usecase-ui.git b/docs/submodules/usecase-ui.git
index d16b64b..5068ef4 160000 (submodule)
--- a/docs/submodules/usecase-ui.git
+++ b/docs/submodules/usecase-ui.git
@@ -1 +1 @@
-Subproject commit d16b64bd12d0049c1e7840b8ba616cea35d724c8
+Subproject commit 5068ef4e733342d03d30ad895e5dcbeb4b6390b1

diff --git a/docs/submodules/vfc/nfvo/lcm.git b/docs/submodules/vfc/nfvo/lcm.git
index 6e60e4f..16e8e22 160000 (submodule)
--- a/docs/submodules/vfc/nfvo/lcm.git
+++ b/docs/submodules/vfc/nfvo/lcm.git
@@ -1 +1 @@
-Subproject commit 6e60e4fe06099f0cdcba32c4a78efa17e7c9977c
+Subproject commit 16e8e22821c23a3a43d89bc8133c5a41de1b110b

diff --git a/docs/submodules/vid.git b/docs/submodules/vid.git
index 8c66bb1..e6bcb0c 160000 (submodule)
--- a/docs/submodules/vid.git
+++ b/docs/submodules/vid.git
@@ -1 +1 @@
-Subproject commit 8c66bb19548227c0d24b41fa931a5956bc445cac
+Subproject commit e6bcb0cd59c6494b3acdccb25c5814c0df4847ef

diff --git a/docs/submodules/vnfrqts/requirements.git b/docs/submodules/vnfrqts/requirements.git
index 7099d63..0d5d97e 160000 (submodule)
--- a/docs/submodules/vnfrqts/requirements.git
+++ b/docs/submodules/vnfrqts/requirements.git
@@ -1 +1 @@
-Subproject commit 7099d63e46b0bc9bb5591a5f28e535b95fba2d86
+Subproject commit 0d5d97e1a128ff5a66a8f664c600fbe8b77fc778

diff --git a/docs/submodules/vnfrqts/testcases.git b/docs/submodules/vnfrqts/testcases.git
index e4cff9e..1248f5d 160000 (submodule)
--- a/docs/submodules/vnfrqts/testcases.git
+++ b/docs/submodules/vnfrqts/testcases.git
@@ -1 +1 @@
-Subproject commit e4cff9ed8bb9f1bd1913f1393963f44f16b734f3
+Subproject commit 1248f5ddbb10f614c20ba85f2a91f3b8caefc11a

diff --git a/docs/submodules/vnfsdk/model.git b/docs/submodules/vnfsdk/model.git
index 12b39e4..d193e4d 160000 (submodule)
--- a/docs/submodules/vnfsdk/model.git
+++ b/docs/submodules/vnfsdk/model.git
@@ -1 +1 @@
-Subproject commit 12b39e4fefe05f767370b70c63c225de5ceea514
+Subproject commit d193e4dd5395437245c54f0de208c55d7a0e26c4

diff --git a/etc/requirements.txt b/etc/requirements.txt
index 8e2894c..aecf5a3 100644 (file)
--- a/etc/requirements.txt
+++ b/etc/requirements.txt
@@ -1,5 +1,5 @@
 tox
-Sphinx==1.6.7
+Sphinx==1.8.1
 doc8
 docutils
 setuptools

diff --git a/shell/smsummary.sh b/shell/smsummary.sh
new file mode 100644 (file)
index 0000000..a4bd1d3
--- /dev/null
+++ b/shell/smsummary.sh
@@ -0,0 +1,26 @@
+# Copyright (c) 2018 Open Network Automation Platform and contributors
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#           http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+#  either express or implied. See the License for the specific
+#  language governing permissions and limitations under the License.
+
+# Create a list of submodules used to build documentation
+# Usage:   sh smsummary.sh output_file
+#
+
+echo "************************************************************************************" > $1
+echo "* Submodule branches used to build this version of the documentation.              *" >> $1
+echo "************************************************************************************" >> $1
+
+git submodule foreach git for-each-ref \
+  --format='%(committerdate:iso8601) %(objectname) %(HEAD) %(refname) %(subject)' \
+  --sort -committerdate refs/heads/ | \
+  sed -e 's:^:       :' -e 's:       Entering .docs/submodules/::' -e 's:.git.$::' -e 's:refs/heads/::' >> $1

diff --git a/tox.ini b/tox.ini
index 574ff4e..d989407 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -6,9 +6,14 @@ skipsdist = true
 [testenv:docs]
 deps = -r{toxinidir}/etc/requirements.txt
 commands =
-    sphinx-build -j 3 -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html
+    sh {toxinidir}/shell/smsummary.sh  {toxinidir}/docs/_static/smsummary.out
+    echo "Summary of submodule versions used in html build in {toxinidir}/docs/_static/smsummary.out"
+    sphinx-build -j 1 -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html
     echo "Generated docs available in {toxinidir}/docs/_build/html"
-whitelist_externals = echo
+whitelist_externals =
+    echo
+    git
+    sh
 
 [testenv:local]
 deps = -r{toxinidir}/etc/requirements.txt