Merge "DOC - Fixing doc linking issue"

diff --git a/docs/guides/onap-user/design/index.rst b/docs/guides/onap-user/design/index.rst
index a779844..29d166c 100644 (file)
--- a/docs/guides/onap-user/design/index.rst
+++ b/docs/guides/onap-user/design/index.rst
@@ -45,7 +45,7 @@ Onboarding, Design and Distribution process.
     in a Service Model
 
 * Service Design
-    A Service Model is created as a composition of resources 
+    A Service Model is created as a composition of resources
     (e.g. V(N)Fs, PNFs,...), Policies, Workflows,...
     The created Service Model will pass a testing workflow and
     handed over to a Governance Approval and Distribution process
@@ -57,22 +57,25 @@ Onboarding, Design and Distribution process.
 
 **The optional/additional Design steps are:**
 
-* Controller Blueprint Design
-    The Controller Blueprint is the overall service design, fully model-driven,
-    intent based package needed for self service provisioning and configuration
-    management automation. The framework to automate the resolution of resources
-    for instantiation and any config provisioning operation,
-    such as day0, day1 or day2 configuration.
-    It provides a tool called Controller Design Studio
+* VNF parameter assignment templating
+    The objective is to automate the resolution of resources for instantiation
+    and any config provisioning operation, such as day0, day1 or day2
+    configuration.
+    The Controller Blueprint archive (CBA) is the overall service design,
+    fully model-driven, intent based package needed to design self service
+    provisioning and configuration management automation.
+    ONAP CDS (Controller Design Studio) is the controller that will process
+    the Controller Blueprint archive (CBA) at run-time.
 
 * Policy Design
-    The Policy Creation component deals with policies.
     These are rules, conditions, requirements, constraints, attributes,
     or needs that must be provided, maintained, and/or enforced.
     At a lower level, Policy involves machine-readable rules enabling
-    actions to be taken based on triggers or requests.
+    actions to be taken based on triggers or requests. ONAP Policy framework
+    provides some policy models that are implemented and pre-loaded when
+    installing ONAP.
 
-* APPC Controller Design
+* VNF LifeCycle Command templating
     APPC Controller Design Tool (CDT) is used for self-service onboarding of
     VNF’s. VNF owners can create templates and other artifacts for APPC
     Configure command (used to apply a post-instantiation configuration)
@@ -91,7 +94,7 @@ Onboarding, Design and Distribution process.
     The design is done in the SDC DCAE-DS (Design Studio).
     The DCAE Design Studio enables to define and configure
     the monitoring flows of DCAE.
-    The configuration and deployment of a Control Loop will be done with 
+    The configuration and deployment of a Control Loop will be done with
     Control Loop Automation Management (CLAMP) tool.
 
 The follwing sections will focus on the different Design steps:
@@ -110,11 +113,11 @@ The follwing sections will focus on the different Design steps:
 
    Governance Approval and Service Distribution <./service-distribution/index.rst>
 
-   Controller Blueprint Design <../../../submodules/ccsdk/cds.git/docs/index.rst>
+   VNF parameter assignment templating <../../../submodules/ccsdk/cds.git/docs/index.rst>
 
    Policy Design <../../../submodules/policy/parent.git/docs/design/design.rst>
 
-   APPC Controller Design <../../../submodules/appc.git/docs/APPC CDT Guide/APPC CDT Guide.rst>
+   VNF LifeCycle Command templating <../../../submodules/appc.git/docs/APPC CDT Guide/APPC CDT Guide.rst>
 
    Workflow Design <../../../submodules/sdc.git/docs/workflow.rst>
 

diff --git a/docs/guides/onap-user/design/media/Design-Overview.png b/docs/guides/onap-user/design/media/Design-Overview.png
old mode 100644 (file)
new mode 100755 (executable)
index f94724e..c0c091a
Binary files a/docs/guides/onap-user/design/media/Design-Overview.png and b/docs/guides/onap-user/design/media/Design-Overview.png differ

diff --git a/docs/guides/onap-user/design/media/Design-Overview.pptx b/docs/guides/onap-user/design/media/Design-Overview.pptx
new file mode 100755 (executable)
index 0000000..835508a
Binary files /dev/null and b/docs/guides/onap-user/design/media/Design-Overview.pptx differ

diff --git a/docs/submodules/aaf/authz.git b/docs/submodules/aaf/authz.git
index 6309ef4..4fde06b 160000 (submodule)
--- a/docs/submodules/aaf/authz.git
+++ b/docs/submodules/aaf/authz.git
@@ -1 +1 @@
-Subproject commit 6309ef454e6960d95d13534645e1f15904de6862
+Subproject commit 4fde06b24f52a3d3fccc84ef36c19831fc0bef8d

diff --git a/docs/submodules/aai/aai-common.git b/docs/submodules/aai/aai-common.git
index 4026e5a..2ce7db3 160000 (submodule)
--- a/docs/submodules/aai/aai-common.git
+++ b/docs/submodules/aai/aai-common.git
@@ -1 +1 @@
-Subproject commit 4026e5a8d2e7fc56663b61b0aa0064a085931cdd
+Subproject commit 2ce7db31da64936d47ec8e211962e1472ceda41d

diff --git a/docs/submodules/appc.git b/docs/submodules/appc.git
index 35d8f73..aa96850 160000 (submodule)
--- a/docs/submodules/appc.git
+++ b/docs/submodules/appc.git
@@ -1 +1 @@
-Subproject commit 35d8f73bfed6211b4d0e799880f991b001dbe0a6
+Subproject commit aa9685086bc7c9094aca1f11280f9db2434810d7

diff --git a/docs/submodules/appc/deployment.git b/docs/submodules/appc/deployment.git
index 98a2f39..bc6ce26 160000 (submodule)
--- a/docs/submodules/appc/deployment.git
+++ b/docs/submodules/appc/deployment.git
@@ -1 +1 @@
-Subproject commit 98a2f39c7ee4c9dd47d59180425a753b926b2b13
+Subproject commit bc6ce262858bf9ce5ac6530ccfe1e84011eac3c8

diff --git a/docs/submodules/ccsdk/apps.git b/docs/submodules/ccsdk/apps.git
index 6c30486..e2ac64b 160000 (submodule)
--- a/docs/submodules/ccsdk/apps.git
+++ b/docs/submodules/ccsdk/apps.git
@@ -1 +1 @@
-Subproject commit 6c30486a840c613628c0b560c0b932536fd65efd
+Subproject commit e2ac64b441aa199f5aff94a2c7fa18d50e5cde71

diff --git a/docs/submodules/ccsdk/cds.git b/docs/submodules/ccsdk/cds.git
index b12d13b..85f7fb2 160000 (submodule)
--- a/docs/submodules/ccsdk/cds.git
+++ b/docs/submodules/ccsdk/cds.git
@@ -1 +1 @@
-Subproject commit b12d13b0b78b7e87912c07a7c946cbbfcee41d47
+Subproject commit 85f7fb219f6e1f4227ac1463290f6a6aafc2b84f

diff --git a/docs/submodules/ccsdk/distribution.git b/docs/submodules/ccsdk/distribution.git
index 6cbe476..9db28a0 160000 (submodule)
--- a/docs/submodules/ccsdk/distribution.git
+++ b/docs/submodules/ccsdk/distribution.git
@@ -1 +1 @@
-Subproject commit 6cbe47603a3c6f6d18f5b21a994448d4e5cc0c32
+Subproject commit 9db28a0963ee77a224232f1ffee92ffa95bdb2a0

diff --git a/docs/submodules/ccsdk/features.git b/docs/submodules/ccsdk/features.git
index 148c153..334b15b 160000 (submodule)
--- a/docs/submodules/ccsdk/features.git
+++ b/docs/submodules/ccsdk/features.git
@@ -1 +1 @@
-Subproject commit 148c15375d3ad12783451c65d092c66c96360357
+Subproject commit 334b15b50d9e9aa25d28fba708a7dfe664df6e6b

diff --git a/docs/submodules/ccsdk/parent.git b/docs/submodules/ccsdk/parent.git
index bed9588..93ebb3d 160000 (submodule)
--- a/docs/submodules/ccsdk/parent.git
+++ b/docs/submodules/ccsdk/parent.git
@@ -1 +1 @@
-Subproject commit bed9588ef11d6b212d3501d1b81ce3a10051a155
+Subproject commit 93ebb3d9db31747fcccd1d6dcb98566e7084cef4

diff --git a/docs/submodules/ccsdk/platform/plugins.git b/docs/submodules/ccsdk/platform/plugins.git
index 85b8365..ee9341e 160000 (submodule)
--- a/docs/submodules/ccsdk/platform/plugins.git
+++ b/docs/submodules/ccsdk/platform/plugins.git
@@ -1 +1 @@
-Subproject commit 85b8365c69b25191ba53390ba8ae9c7ad8e9f18b
+Subproject commit ee9341e37f22c8cef87c48569ffdff1057c27ebe

diff --git a/docs/submodules/ccsdk/utils.git b/docs/submodules/ccsdk/utils.git
index c3a2bbc..c21049b 160000 (submodule)
--- a/docs/submodules/ccsdk/utils.git
+++ b/docs/submodules/ccsdk/utils.git
@@ -1 +1 @@
-Subproject commit c3a2bbc077e0d605477b1ff9d6f5590182c8a1b1
+Subproject commit c21049bc20ed301a0bfe4680a7924b0f91ea9023

diff --git a/docs/submodules/clamp.git b/docs/submodules/clamp.git
index 2f045be..f0d7a96 160000 (submodule)
--- a/docs/submodules/clamp.git
+++ b/docs/submodules/clamp.git
@@ -1 +1 @@
-Subproject commit 2f045be5f18afd9fdbb8844c19398ed2374dbf5e
+Subproject commit f0d7a9645a2b773df5d278d3858ce36a61f23645

diff --git a/docs/submodules/cli.git b/docs/submodules/cli.git
index 3f698ab..97830fd 160000 (submodule)
--- a/docs/submodules/cli.git
+++ b/docs/submodules/cli.git
@@ -1 +1 @@
-Subproject commit 3f698ab311e801115d4e69deadcd20777319084a
+Subproject commit 97830fdd6e1b596219f8759716c75776ba10121f

diff --git a/docs/submodules/dcaegen2.git b/docs/submodules/dcaegen2.git
index 0143ffd..5b41cf0 160000 (submodule)
--- a/docs/submodules/dcaegen2.git
+++ b/docs/submodules/dcaegen2.git
@@ -1 +1 @@
-Subproject commit 0143ffd31b5ed4e7018ceefae599010819ffa359
+Subproject commit 5b41cf0509c238c0439bcd244428330ac0d73713

diff --git a/docs/submodules/dmaap/datarouter.git b/docs/submodules/dmaap/datarouter.git
index 79f3b3c..18e2259 160000 (submodule)
--- a/docs/submodules/dmaap/datarouter.git
+++ b/docs/submodules/dmaap/datarouter.git
@@ -1 +1 @@
-Subproject commit 79f3b3c261e88c5b83227911d49957a546b1f0b5
+Subproject commit 18e2259469f0185c12f7c63e91d8f1ac82979d1d

diff --git a/docs/submodules/externalapi/nbi.git b/docs/submodules/externalapi/nbi.git
index 8a2baa3..ab38dd3 160000 (submodule)
--- a/docs/submodules/externalapi/nbi.git
+++ b/docs/submodules/externalapi/nbi.git
@@ -1 +1 @@
-Subproject commit 8a2baa3b0c847fcdbe25df7124587fa09256f0b7
+Subproject commit ab38dd33bc35ae61fc40d5c4a090a21cb214078c

diff --git a/docs/submodules/integration.git b/docs/submodules/integration.git
index ec8c60c..9897851 160000 (submodule)
--- a/docs/submodules/integration.git
+++ b/docs/submodules/integration.git
@@ -1 +1 @@
-Subproject commit ec8c60c7c969f9fc2cdc98cdfd5c5f0ea85f5f6f
+Subproject commit 98978513564b1f0fbb25d2d3888b7e603956baa1

diff --git a/docs/submodules/logging-analytics.git b/docs/submodules/logging-analytics.git
index 5104a66..cce9554 160000 (submodule)
--- a/docs/submodules/logging-analytics.git
+++ b/docs/submodules/logging-analytics.git
@@ -1 +1 @@
-Subproject commit 5104a66d12a2ada0819d1cbcaf935785748f2b87
+Subproject commit cce9554c9771c0227edc17181c2011d28a9c052b

diff --git a/docs/submodules/logging-analytics/pomba/pomba-audit-common.git b/docs/submodules/logging-analytics/pomba/pomba-audit-common.git
index 8c337af..01494f4 160000 (submodule)
--- a/docs/submodules/logging-analytics/pomba/pomba-audit-common.git
+++ b/docs/submodules/logging-analytics/pomba/pomba-audit-common.git
@@ -1 +1 @@
-Subproject commit 8c337af8afa9e736b7503291e836ff993fff326e
+Subproject commit 01494f43edc57440e89f026284c5280ec0228244

diff --git a/docs/submodules/modeling/modelspec.git b/docs/submodules/modeling/modelspec.git
index ccd7fa2..84551ce 160000 (submodule)
--- a/docs/submodules/modeling/modelspec.git
+++ b/docs/submodules/modeling/modelspec.git
@@ -1 +1 @@
-Subproject commit ccd7fa20d6d02cb2e68c0c5955bb54d95dcb74e3
+Subproject commit 84551cee6a54631423eb5b61a5d507927cb1f7a6

diff --git a/docs/submodules/multicloud/framework.git b/docs/submodules/multicloud/framework.git
index aa74454..35a4efa 160000 (submodule)
--- a/docs/submodules/multicloud/framework.git
+++ b/docs/submodules/multicloud/framework.git
@@ -1 +1 @@
-Subproject commit aa7445448861c403c082b20a372c4d5abb35e0ee
+Subproject commit 35a4efa3c81e966968c9742762fbf5d78db8c643

diff --git a/docs/submodules/multicloud/k8s.git b/docs/submodules/multicloud/k8s.git
index e26aad8..4655f55 160000 (submodule)
--- a/docs/submodules/multicloud/k8s.git
+++ b/docs/submodules/multicloud/k8s.git
@@ -1 +1 @@
-Subproject commit e26aad8235b1fc8c9c53e0014f1b308e9df4ffb8
+Subproject commit 4655f550c8c03a6384fa90746f1af021348ec6ef

diff --git a/docs/submodules/music.git b/docs/submodules/music.git
index 6aad1c6..4fe3f08 160000 (submodule)
--- a/docs/submodules/music.git
+++ b/docs/submodules/music.git
@@ -1 +1 @@
-Subproject commit 6aad1c6198726b0e7963db363ea0cfc28e93fcd5
+Subproject commit 4fe3f08aa1c93a1fc81a78544031ef747a747098

diff --git a/docs/submodules/oom.git b/docs/submodules/oom.git
index a93633c..cf813f9 160000 (submodule)
--- a/docs/submodules/oom.git
+++ b/docs/submodules/oom.git
@@ -1 +1 @@
-Subproject commit a93633c3aa539cfd15818263b6c3fa3d2b0fefa4
+Subproject commit cf813f9c98fe435fb1af765d6290876ba24984d9

diff --git a/docs/submodules/oom/offline-installer.git b/docs/submodules/oom/offline-installer.git
index 0364bc6..7c1131e 160000 (submodule)
--- a/docs/submodules/oom/offline-installer.git
+++ b/docs/submodules/oom/offline-installer.git
@@ -1 +1 @@
-Subproject commit 0364bc6ebc6d26877f1db1be342a10b24f51d80b
+Subproject commit 7c1131e5b46160a1ba4ee52d59b4650cdc1a4c9d

diff --git a/docs/submodules/optf/has.git b/docs/submodules/optf/has.git
index 6b09bca..4337dfb 160000 (submodule)
--- a/docs/submodules/optf/has.git
+++ b/docs/submodules/optf/has.git
@@ -1 +1 @@
-Subproject commit 6b09bcaf2cea9abd3151dcf5dcd159ce684fc479
+Subproject commit 4337dfb81c893522af34e9869f65f5a73b72d7b5

diff --git a/docs/submodules/policy/engine.git b/docs/submodules/policy/engine.git
index c7ebafd..1d48c01 160000 (submodule)
--- a/docs/submodules/policy/engine.git
+++ b/docs/submodules/policy/engine.git
@@ -1 +1 @@
-Subproject commit c7ebafd4e235416090ddcea8eadc37ffad53bdc9
+Subproject commit 1d48c011fb5368dece0a180edab9d18f8efd860a

diff --git a/docs/submodules/policy/parent.git b/docs/submodules/policy/parent.git
index de8c092..c0784b5 160000 (submodule)
--- a/docs/submodules/policy/parent.git
+++ b/docs/submodules/policy/parent.git
@@ -1 +1 @@
-Subproject commit de8c0925f5d8022c147d688e77f47fa5388f51e1
+Subproject commit c0784b571a00ff28117ae20d7e55cc885db71557

diff --git a/docs/submodules/portal.git b/docs/submodules/portal.git
index f5527a4..e10ac25 160000 (submodule)
--- a/docs/submodules/portal.git
+++ b/docs/submodules/portal.git
@@ -1 +1 @@
-Subproject commit f5527a452de839357e3bcd1a1d93d152de4958a1
+Subproject commit e10ac2557a212fc18cbb7aee51adb8f7f606eade

diff --git a/docs/submodules/sdc.git b/docs/submodules/sdc.git
index 7de4f3e..b5cc5d6 160000 (submodule)
--- a/docs/submodules/sdc.git
+++ b/docs/submodules/sdc.git
@@ -1 +1 @@
-Subproject commit 7de4f3e788ff2b71936ae43be7dfbdf48740f9be
+Subproject commit b5cc5d63befc07120d0856a0e09b645aff88e4a3

diff --git a/docs/submodules/sdc/sdc-distribution-client.git b/docs/submodules/sdc/sdc-distribution-client.git
index a6906f0..75b5636 160000 (submodule)
--- a/docs/submodules/sdc/sdc-distribution-client.git
+++ b/docs/submodules/sdc/sdc-distribution-client.git
@@ -1 +1 @@
-Subproject commit a6906f05493e09a0a0787ac5dbd3066407b13827
+Subproject commit 75b5636a5ecb293b021409e287d4c22481c1aa90

diff --git a/docs/submodules/sdc/sdc-tosca.git b/docs/submodules/sdc/sdc-tosca.git
index 11f413e..d587783 160000 (submodule)
--- a/docs/submodules/sdc/sdc-tosca.git
+++ b/docs/submodules/sdc/sdc-tosca.git
@@ -1 +1 @@
-Subproject commit 11f413efa986f4e9cbabd067479361d41aec5e77
+Subproject commit d587783f089e834be0f568fe6ba30a3dc710199a

diff --git a/docs/submodules/sdc/sdc-workflow-designer.git b/docs/submodules/sdc/sdc-workflow-designer.git
index 61ccc9e..0107aa9 160000 (submodule)
--- a/docs/submodules/sdc/sdc-workflow-designer.git
+++ b/docs/submodules/sdc/sdc-workflow-designer.git
@@ -1 +1 @@
-Subproject commit 61ccc9e58b55d96330892231047a239dadf409a0
+Subproject commit 0107aa9f0f2101110e3d1a79602a3e663bbbf8c8

diff --git a/docs/submodules/sdnc/oam.git b/docs/submodules/sdnc/oam.git
index f4be5f4..49752d7 160000 (submodule)
--- a/docs/submodules/sdnc/oam.git
+++ b/docs/submodules/sdnc/oam.git
@@ -1 +1 @@
-Subproject commit f4be5f4fbf547700a2caa24626d4ab184f563ba0
+Subproject commit 49752d7a66e8edf73e94fd2f7c6191dba1d2d2fc

diff --git a/docs/submodules/so.git b/docs/submodules/so.git
index 7995ef4..464d3ff 160000 (submodule)
--- a/docs/submodules/so.git
+++ b/docs/submodules/so.git
@@ -1 +1 @@
-Subproject commit 7995ef475cc8b064b94d9ba54df4dbd8e15645d0
+Subproject commit 464d3ffa9c373f36747b10a03554d20dfa4a571b

diff --git a/docs/submodules/usecase-ui.git b/docs/submodules/usecase-ui.git
index 444e53d..364ae06 160000 (submodule)
--- a/docs/submodules/usecase-ui.git
+++ b/docs/submodules/usecase-ui.git
@@ -1 +1 @@
-Subproject commit 444e53d8ea2f15d60c29e68a1883ee91ca5ee367
+Subproject commit 364ae06e60c429a92d33985ed6016159ab49d495

diff --git a/docs/submodules/vfc/nfvo/lcm.git b/docs/submodules/vfc/nfvo/lcm.git
index 2dc27ce..dd0ba44 160000 (submodule)
--- a/docs/submodules/vfc/nfvo/lcm.git
+++ b/docs/submodules/vfc/nfvo/lcm.git
@@ -1 +1 @@
-Subproject commit 2dc27ce8f84c77d3e2fe02576a222683aa19adf4
+Subproject commit dd0ba443be71964a454c29010dc6f1e554165290

diff --git a/docs/submodules/vid.git b/docs/submodules/vid.git
index 91d3f65..3171bdb 160000 (submodule)
--- a/docs/submodules/vid.git
+++ b/docs/submodules/vid.git
@@ -1 +1 @@
-Subproject commit 91d3f65455177e10eb22d639afcc00cde6ad90a2
+Subproject commit 3171bdbbf3882ed02d0c4e9807b360035493a197

diff --git a/docs/submodules/vnfrqts/requirements.git b/docs/submodules/vnfrqts/requirements.git
index ce06279..4c5fd59 160000 (submodule)
--- a/docs/submodules/vnfrqts/requirements.git
+++ b/docs/submodules/vnfrqts/requirements.git
@@ -1 +1 @@
-Subproject commit ce06279cbf236aa79b76473747b7433ce39fb69e
+Subproject commit 4c5fd59ac5f5e6a1b85fac2480725c30eac8aa4f

diff --git a/docs/submodules/vvp/documentation.git b/docs/submodules/vvp/documentation.git
index 7766554..e1e4e93 160000 (submodule)
--- a/docs/submodules/vvp/documentation.git
+++ b/docs/submodules/vvp/documentation.git
@@ -1 +1 @@
-Subproject commit 7766554b3057c8955ec8c0c15e4d9c62a83eb126
+Subproject commit e1e4e93ba2d570070058aaec64d69ef3123f7303