diff options
49 files changed, 24 insertions, 21 deletions
diff --git a/.gitmodules b/.gitmodules index 5193b049f..ed846d4f7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -358,13 +358,13 @@ url = ../policy/parent branch = . ignore = dirty -[submodule "docs/submodules/modeling/genericparser.git"] - path = docs/submodules/modeling/genericparser.git - url = ../modeling/genericparser - branch = . - ignore = dirty [submodule "docs/submodules/osa.git"] path = docs/submodules/osa.git url = ../osa branch = master ignore = dirty +[submodule "docs/submodules/modeling/etsicatalog.git"] + path = docs/submodules/modeling/etsicatalog.git + url = ../modeling/etsicatalog + branch = master + ignore = dirty diff --git a/docs/guides/onap-user/design/index.rst b/docs/guides/onap-user/design/index.rst index a77984456..29d166ccb 100644 --- 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 Binary files differindex f94724e1e..c0c091ac0 100644..100755 --- a/docs/guides/onap-user/design/media/Design-Overview.png +++ b/docs/guides/onap-user/design/media/Design-Overview.png diff --git a/docs/guides/onap-user/design/media/Design-Overview.pptx b/docs/guides/onap-user/design/media/Design-Overview.pptx Binary files differnew file mode 100755 index 000000000..835508a4c --- /dev/null +++ b/docs/guides/onap-user/design/media/Design-Overview.pptx diff --git a/docs/release/repolist.rst b/docs/release/repolist.rst index 9f59f0027..30d94005b 100644 --- a/docs/release/repolist.rst +++ b/docs/release/repolist.rst @@ -93,4 +93,4 @@ Project/Components oom/offline-installer <../submodules/oom/offline-installer.git/docs/index> ccsdk/features <../submodules/ccsdk/features.git/docs/index> parent <../submodules/parent.git/docs/index> - modeling/genericparser <../submodules/modeling/genericparser.git/docs/index> + modeling/etsicatalog <../submodules/modeling/etsicatalog.git/docs/index> diff --git a/docs/submodules/aaf/authz.git b/docs/submodules/aaf/authz.git -Subproject 5ef26dcdd8588ec7956c713c2777dd4f0a61798 +Subproject 7afca63faf20cf6ee680f80e08d4cfebecbab9c diff --git a/docs/submodules/appc.git b/docs/submodules/appc.git -Subproject f2c1c952765c0a4df2545ebec7b7f6e5c59617b +Subproject 151924670b390b8811283802ae7e20c3d63505d diff --git a/docs/submodules/appc/deployment.git b/docs/submodules/appc/deployment.git -Subproject 6989e98ea8d2293aa90aacc1b864fb724643156 +Subproject b06633f6726680f878a4dda1bc0545f072872d2 diff --git a/docs/submodules/ccsdk/apps.git b/docs/submodules/ccsdk/apps.git -Subproject 6c30486a840c613628c0b560c0b932536fd65ef +Subproject 0988e9613f00ca1885396a64f27bff2daffb978 diff --git a/docs/submodules/ccsdk/cds.git b/docs/submodules/ccsdk/cds.git -Subproject 1a7d92d35a4fdadd162b2eece4a75c04037b9c7 +Subproject 799f04c129b09d29ebd1b87092dea699a4174d1 diff --git a/docs/submodules/ccsdk/dashboard.git b/docs/submodules/ccsdk/dashboard.git -Subproject 70638d1eb225acbc61e00ddbf9356aef38e8f14 +Subproject 2ac46fd53461288d5d99a9c0ebb8a3a5216db2a diff --git a/docs/submodules/ccsdk/distribution.git b/docs/submodules/ccsdk/distribution.git -Subproject 6cbe47603a3c6f6d18f5b21a994448d4e5cc0c3 +Subproject 3948e2a63a58dbc3e1fec980971a1756fafb238 diff --git a/docs/submodules/ccsdk/features.git b/docs/submodules/ccsdk/features.git -Subproject 148c15375d3ad12783451c65d092c66c9636035 +Subproject a6557cbba03576e7593160fd2a6abe68f0af86b diff --git a/docs/submodules/ccsdk/parent.git b/docs/submodules/ccsdk/parent.git -Subproject bed9588ef11d6b212d3501d1b81ce3a10051a15 +Subproject e45b6a2c0f8efcbf73ece25bfebbec8d6624525 diff --git a/docs/submodules/ccsdk/platform/plugins.git b/docs/submodules/ccsdk/platform/plugins.git -Subproject 85b8365c69b25191ba53390ba8ae9c7ad8e9f18 +Subproject ee9341e37f22c8cef87c48569ffdff1057c27eb diff --git a/docs/submodules/ccsdk/utils.git b/docs/submodules/ccsdk/utils.git -Subproject c3a2bbc077e0d605477b1ff9d6f5590182c8a1b +Subproject c21049bc20ed301a0bfe4680a7924b0f91ea902 diff --git a/docs/submodules/clamp.git b/docs/submodules/clamp.git -Subproject 3c86358f306e61bcc7d8f3143977a55faa0f4e6 +Subproject 27cbec79e30f7e25a7419be38dd9bb7c324c782 diff --git a/docs/submodules/cli.git b/docs/submodules/cli.git -Subproject a050aba6575423744b4d34df79aac857c25547e +Subproject 91b170c9334feaef47273b51f69c1471171464a diff --git a/docs/submodules/dcaegen2.git b/docs/submodules/dcaegen2.git -Subproject 0143ffd31b5ed4e7018ceefae599010819ffa35 +Subproject 1bba7ea8b9109e23c48af2a435745553f581f1b diff --git a/docs/submodules/dmaap/datarouter.git b/docs/submodules/dmaap/datarouter.git -Subproject 79f3b3c261e88c5b83227911d49957a546b1f0b +Subproject 029b5296b1bc070be3f1718190c50a1d58a2ecf diff --git a/docs/submodules/externalapi/nbi.git b/docs/submodules/externalapi/nbi.git -Subproject 67de4dddc1903056e64dd87a5499ae30884031f +Subproject ab38dd33bc35ae61fc40d5c4a090a21cb214078 diff --git a/docs/submodules/integration.git b/docs/submodules/integration.git -Subproject 6e7e055e27731b451437aefa336d382f31cbc38 +Subproject 97919e81b8721ae451d3c18d6b5b16ea3b4566f diff --git a/docs/submodules/logging-analytics.git b/docs/submodules/logging-analytics.git -Subproject cce9554c9771c0227edc17181c2011d28a9c052 +Subproject 80edd8f2f5fd4c03b8492795d864e3c79487dc7 diff --git a/docs/submodules/logging-analytics/pomba/pomba-audit-common.git b/docs/submodules/logging-analytics/pomba/pomba-audit-common.git -Subproject 8c337af8afa9e736b7503291e836ff993fff326 +Subproject 01494f43edc57440e89f026284c5280ec022824 diff --git a/docs/submodules/modeling/etsicatalog.git b/docs/submodules/modeling/etsicatalog.git new file mode 160000 +Subproject cd7e6ff91caf2388a041ef670d22504874a0bc5 diff --git a/docs/submodules/modeling/genericparser.git b/docs/submodules/modeling/genericparser.git deleted file mode 160000 -Subproject 05947d61cb8643ab41a394154ea8b73f12fb32f diff --git a/docs/submodules/modeling/modelspec.git b/docs/submodules/modeling/modelspec.git -Subproject ccd7fa20d6d02cb2e68c0c5955bb54d95dcb74e +Subproject a0335b463c3df8d9c13ff55991d8b3bd0861e3f diff --git a/docs/submodules/multicloud/framework.git b/docs/submodules/multicloud/framework.git -Subproject aa7445448861c403c082b20a372c4d5abb35e0e +Subproject 35a4efa3c81e966968c9742762fbf5d78db8c64 diff --git a/docs/submodules/multicloud/k8s.git b/docs/submodules/multicloud/k8s.git -Subproject 94174f17d9bbc8187f668e1656527473c38e9d4 +Subproject 7c1fb25948c06e4e0b572241ae292fc31a4f4af diff --git a/docs/submodules/music.git b/docs/submodules/music.git -Subproject 6aad1c6198726b0e7963db363ea0cfc28e93fcd +Subproject 08a17c93ecd50971172026dafb5456f41040ea1 diff --git a/docs/submodules/oom.git b/docs/submodules/oom.git -Subproject e1365f396668e87673f477cd620aa6df3fbf062 +Subproject 73e71776a0036eeb5eff5a92eb15145ce1644ee diff --git a/docs/submodules/oom/offline-installer.git b/docs/submodules/oom/offline-installer.git -Subproject 1da8b7af533aa48450d42219f0615d0bb510da4 +Subproject 37baf499bd05b499b1fb8194266fe93dcfbd0b5 diff --git a/docs/submodules/optf/cmso.git b/docs/submodules/optf/cmso.git -Subproject 05d1e18373779df333d1f1fa30cc4891a8da59a +Subproject 835f29fe2fabbaa1d2c12f931166f78c8007aae diff --git a/docs/submodules/optf/has.git b/docs/submodules/optf/has.git -Subproject 4337dfb81c893522af34e9869f65f5a73b72d7b +Subproject c630070a3e37615c23456e080322fb25d9bace3 diff --git a/docs/submodules/policy/engine.git b/docs/submodules/policy/engine.git -Subproject c7ebafd4e235416090ddcea8eadc37ffad53bdc +Subproject b66330d7b5382aff22d3b29d542c6d2fe2d72ab diff --git a/docs/submodules/policy/parent.git b/docs/submodules/policy/parent.git -Subproject 2f6374abde13a8e62e15387690b9f0cc1981814 +Subproject 8b0f5cc7be20fe5868319c8f720aff02a3db133 diff --git a/docs/submodules/portal.git b/docs/submodules/portal.git -Subproject f5527a452de839357e3bcd1a1d93d152de4958a +Subproject 5fe839bc8f5b536d5cb48297cf16c4d63e45641 diff --git a/docs/submodules/sdc.git b/docs/submodules/sdc.git -Subproject 1da40f4a4b7cf94afc034bfbc078f09921d92fc +Subproject b5cc5d63befc07120d0856a0e09b645aff88e4a diff --git a/docs/submodules/sdc/sdc-distribution-client.git b/docs/submodules/sdc/sdc-distribution-client.git -Subproject a6906f05493e09a0a0787ac5dbd3066407b1382 +Subproject 75b5636a5ecb293b021409e287d4c22481c1aa9 diff --git a/docs/submodules/sdc/sdc-tosca.git b/docs/submodules/sdc/sdc-tosca.git -Subproject e19def08fa82176057e23ee54f0fb5130a61935 +Subproject d587783f089e834be0f568fe6ba30a3dc710199 diff --git a/docs/submodules/sdc/sdc-workflow-designer.git b/docs/submodules/sdc/sdc-workflow-designer.git -Subproject 61ccc9e58b55d96330892231047a239dadf409a +Subproject 0107aa9f0f2101110e3d1a79602a3e663bbbf8c diff --git a/docs/submodules/sdnc/oam.git b/docs/submodules/sdnc/oam.git -Subproject f4be5f4fbf547700a2caa24626d4ab184f563ba +Subproject 454e3427c79eb811db3427bc992e136f84fe3a0 diff --git a/docs/submodules/so.git b/docs/submodules/so.git -Subproject 27b5bdaeac9d4606348437db862fe8295b97792 +Subproject 80d6f2f06e538dbb212f968514f0943bb7dd41b diff --git a/docs/submodules/usecase-ui.git b/docs/submodules/usecase-ui.git -Subproject 0b7a31d8663a5124da9a443f1c0147d5bd68bf2 +Subproject 8e369eb5aff2699160f565a1c388fc150905726 diff --git a/docs/submodules/vfc/nfvo/lcm.git b/docs/submodules/vfc/nfvo/lcm.git -Subproject a6126f7c94e5ab9454066e69083e9955589f340 +Subproject 6cd75e78667cd31930a696d4d48eabcfff2abb8 diff --git a/docs/submodules/vid.git b/docs/submodules/vid.git -Subproject 435d688a7ae71c726ca7e96f8d0bb61d01afb59 +Subproject 6e08835bcfe44b02f73d349b0d87aa3591bc45e diff --git a/docs/submodules/vnfrqts/requirements.git b/docs/submodules/vnfrqts/requirements.git -Subproject ce06279cbf236aa79b76473747b7433ce39fb69 +Subproject edcc80916503fa6a91d1ac39a11dc413e039075 diff --git a/docs/submodules/vvp/documentation.git b/docs/submodules/vvp/documentation.git -Subproject 3326ce230c992382896905d9b7c642faa602319 +Subproject a6b7b70c273ad869f4a3ea77f9717b10cdaf162 @@ -16,7 +16,7 @@ whitelist_externals = [testenv:local] deps = -r{toxinidir}/etc/requirements.txt commands = - git submodule update --depth 1 --init + git submodule update --depth 100 --init sphinx-build -j 4 -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html echo "Generated docs available in {toxinidir}/docs/_build/html" whitelist_externals = |
