diff options
62 files changed, 29 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 @@ -56,6 +56,11 @@ committers: company: 'Nokia' id: 'tperala' timezone: 'Europe/Helsinki' + - name: 'Andreas Geissler' + email: 'andreas-geissler@telekom.de' + company: 'Deutsche Telekom' + id: 'andreas.geissler' + timezone: 'Germany/Cologne' tsc: approval: 'https://lists.onap.org/pipermail/onap-tsc' changes: 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 128345fbbf2fe28d65899c4c0a02ff063a97807 +Subproject 6b7b912348ae60b2217af57749ac00a67080bf1 diff --git a/docs/submodules/aai/aai-common.git b/docs/submodules/aai/aai-common.git -Subproject 2ce7db31da64936d47ec8e211962e1472ceda41 +Subproject 5c3e18d49e9792c8b8e502d5b629ed81b51ff09 diff --git a/docs/submodules/appc.git b/docs/submodules/appc.git -Subproject f2c1c952765c0a4df2545ebec7b7f6e5c59617b +Subproject c471ec3ab07ef9fc085748c1364215c18963f16 diff --git a/docs/submodules/appc/deployment.git b/docs/submodules/appc/deployment.git -Subproject b8e46a813a4c1810e9845d2013611d02da129d1 +Subproject 94682f124d792fee71f78bd9c3fce7a4e94d26b diff --git a/docs/submodules/ccsdk/apps.git b/docs/submodules/ccsdk/apps.git -Subproject 6c30486a840c613628c0b560c0b932536fd65ef +Subproject 08409f0df6ba46e2e2b8ac4886c6727b4169c6f diff --git a/docs/submodules/ccsdk/cds.git b/docs/submodules/ccsdk/cds.git -Subproject 16dfa234954d54334f73b2a5c0ed3da47ff27c1 +Subproject 809993fe658026f4cb953e49ab0331e2d4e5c8f 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 2951652d185277ccbf36e7b53df014b895889b7 diff --git a/docs/submodules/ccsdk/features.git b/docs/submodules/ccsdk/features.git -Subproject 4b8e365a78261942cb7b8384d5138d9e5056898 +Subproject a6557cbba03576e7593160fd2a6abe68f0af86b diff --git a/docs/submodules/ccsdk/parent.git b/docs/submodules/ccsdk/parent.git -Subproject bed9588ef11d6b212d3501d1b81ce3a10051a15 +Subproject 632a1f3cc13664249eb6f7f95d19ded659d1b98 diff --git a/docs/submodules/ccsdk/platform/plugins.git b/docs/submodules/ccsdk/platform/plugins.git -Subproject 85b8365c69b25191ba53390ba8ae9c7ad8e9f18 +Subproject b50321b613a139d7cb1732d1814194bafb65743 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 9961ca616538f9fd3931d03cf2aec9344c11609 diff --git a/docs/submodules/cli.git b/docs/submodules/cli.git -Subproject 97830fdd6e1b596219f8759716c75776ba10121 +Subproject a52f00e9d0af1181d3e9c87508789fb4ced022f diff --git a/docs/submodules/dcaegen2.git b/docs/submodules/dcaegen2.git -Subproject 0143ffd31b5ed4e7018ceefae599010819ffa35 +Subproject 1bba7ea8b9109e23c48af2a435745553f581f1b diff --git a/docs/submodules/dmaap/buscontroller.git b/docs/submodules/dmaap/buscontroller.git -Subproject ab4d78a462a8110cae9278c13fbfccb3d34f208 +Subproject 2d14d6dff3456430022efe6cf3607c9f8794a29 diff --git a/docs/submodules/dmaap/datarouter.git b/docs/submodules/dmaap/datarouter.git -Subproject 18e2259469f0185c12f7c63e91d8f1ac82979d1 +Subproject 029b5296b1bc070be3f1718190c50a1d58a2ecf diff --git a/docs/submodules/dmaap/dbcapi.git b/docs/submodules/dmaap/dbcapi.git -Subproject 26a7eb9dea0fb9726d696422f8de54a8ac19899 +Subproject 8b4d21007bdd969b059906385d8b887c767b247 diff --git a/docs/submodules/dmaap/messagerouter/messageservice.git b/docs/submodules/dmaap/messagerouter/messageservice.git -Subproject 5578af7e4d0347428f3cb1ac12d0ffd1dab7b1c +Subproject 681bcde4445437de3b0d826c3e8e4af6231a174 diff --git a/docs/submodules/externalapi/nbi.git b/docs/submodules/externalapi/nbi.git -Subproject 746d161edf22f10fd96a158fa7001f74b21d680 +Subproject ab38dd33bc35ae61fc40d5c4a090a21cb214078 diff --git a/docs/submodules/integration.git b/docs/submodules/integration.git -Subproject 6e7e055e27731b451437aefa336d382f31cbc38 +Subproject 383a3e820a83c7c526aee35312a94a923a53022 diff --git a/docs/submodules/logging-analytics.git b/docs/submodules/logging-analytics.git -Subproject cce9554c9771c0227edc17181c2011d28a9c052 +Subproject 68a5ea019002d9d62342ddf35351fcfccf9b0ad 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 9ec0fc3a923179d97c1610f44641b7a43c306b8 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 6005b1ac5b91162a73798d683acb0039f07d9de diff --git a/docs/submodules/msb/apigateway.git b/docs/submodules/msb/apigateway.git -Subproject a05a45fe19bcae74be121b3b91bc8dd9ff6f7d7 +Subproject 2b5b62d268373e499e261416c6828591ff04246 diff --git a/docs/submodules/msb/discovery.git b/docs/submodules/msb/discovery.git -Subproject eda17e6ca39df76404df3cd0d8ff482a84d03b2 +Subproject 4809cc1162e266a220e1b125309a3166e1d9cce diff --git a/docs/submodules/msb/java-sdk.git b/docs/submodules/msb/java-sdk.git -Subproject 78852e4f3a551022b311499c9f837dc581d776e +Subproject c9d41241f6052c0838a8b8a1e63d0c25958b3ca diff --git a/docs/submodules/msb/swagger-sdk.git b/docs/submodules/msb/swagger-sdk.git -Subproject 765d63dd4d609d498f89c6cb310d6b8e73ab949 +Subproject d9bc68bc2f78420ce07cc2d5d320c2c5d30ad68 diff --git a/docs/submodules/multicloud/framework.git b/docs/submodules/multicloud/framework.git -Subproject 78920e6afaf4b888e4e38fdf78dd24602656ea1 +Subproject 92ef113803cf4b31ac23a6e11d12b16e676563d diff --git a/docs/submodules/multicloud/k8s.git b/docs/submodules/multicloud/k8s.git -Subproject 77ce224e1b3736f0c0b398b5a5b57ea58ebbaa5 +Subproject 1b8bee840af30f67fcdc0d45ef9334f0461ca1c diff --git a/docs/submodules/music.git b/docs/submodules/music.git -Subproject 6aad1c6198726b0e7963db363ea0cfc28e93fcd +Subproject a681a9e295dc2b8f35dd42251f795d0079471ac diff --git a/docs/submodules/oom.git b/docs/submodules/oom.git -Subproject 26f7c28c3c97b7c7300259956b4bd7b5c456d28 +Subproject eeebff31ba9ad1358ee97a8df37586864098304 diff --git a/docs/submodules/oom/offline-installer.git b/docs/submodules/oom/offline-installer.git -Subproject 1da8b7af533aa48450d42219f0615d0bb510da4 +Subproject ec5d45ce17d16982f22039409dccc756fd4a057 diff --git a/docs/submodules/optf/cmso.git b/docs/submodules/optf/cmso.git -Subproject 05d1e18373779df333d1f1fa30cc4891a8da59a +Subproject 8f9976f2db7221fec425ff64e55bbedb6504ed2 diff --git a/docs/submodules/optf/has.git b/docs/submodules/optf/has.git -Subproject 4337dfb81c893522af34e9869f65f5a73b72d7b +Subproject 602f77bf2e45936b0cd974788d2b58a5f5e2e39 diff --git a/docs/submodules/policy/engine.git b/docs/submodules/policy/engine.git -Subproject c7ebafd4e235416090ddcea8eadc37ffad53bdc +Subproject ffd7241c7bfa8d8b68b504406fc6ed4cc299ffe diff --git a/docs/submodules/policy/parent.git b/docs/submodules/policy/parent.git -Subproject c0784b571a00ff28117ae20d7e55cc885db7155 +Subproject 36ad194c41e7a0fb6adb0df707188147fdc232d diff --git a/docs/submodules/portal.git b/docs/submodules/portal.git -Subproject 485c51d686e57d53571c9e3c64e109e67c1b6f6 +Subproject 9306dd8333497633a0c764998b0da528ead0ffe diff --git a/docs/submodules/sdc.git b/docs/submodules/sdc.git -Subproject 1da40f4a4b7cf94afc034bfbc078f09921d92fc +Subproject 003853d0d95c142e857b9e73f0164123e7e685e diff --git a/docs/submodules/sdc/sdc-distribution-client.git b/docs/submodules/sdc/sdc-distribution-client.git -Subproject 72ebecfaa1774b909c7ece40e5124e74248cba4 +Subproject 701842e370ade0354cb443c010113900bfda449 diff --git a/docs/submodules/sdc/sdc-docker-base.git b/docs/submodules/sdc/sdc-docker-base.git -Subproject 639278ba4ddea0ca7402839bc2e49ac70f2e14e +Subproject 6cdcb857261019e1dbd154fe6f27a68b124cfb4 diff --git a/docs/submodules/sdc/sdc-tosca.git b/docs/submodules/sdc/sdc-tosca.git -Subproject e19def08fa82176057e23ee54f0fb5130a61935 +Subproject 9ea78f2e3ac764a0a313b356764283277bcf702 diff --git a/docs/submodules/sdc/sdc-workflow-designer.git b/docs/submodules/sdc/sdc-workflow-designer.git -Subproject 61ccc9e58b55d96330892231047a239dadf409a +Subproject 12d0516104bae658d9a83e4eff767ac57d57555 diff --git a/docs/submodules/sdnc/oam.git b/docs/submodules/sdnc/oam.git -Subproject 49752d7a66e8edf73e94fd2f7c6191dba1d2d2f +Subproject 328a0562c256b4d3781765506dded054b58c342 diff --git a/docs/submodules/so.git b/docs/submodules/so.git -Subproject 27b5bdaeac9d4606348437db862fe8295b97792 +Subproject 6f8ed4f558226640d00b2069ae3e8d254364f80 diff --git a/docs/submodules/so/libs.git b/docs/submodules/so/libs.git -Subproject cef365681191dd67ae790ba9553efd2776890a1 +Subproject 43e0541c889dff97f1368e0994254e26c2ccbfe diff --git a/docs/submodules/usecase-ui.git b/docs/submodules/usecase-ui.git -Subproject ed3a07f731f0c6f70234ca107ac46f44ec538fa +Subproject 03faffe8da4c35f2807334489ba80eb562890d6 diff --git a/docs/submodules/vfc/nfvo/driver/vnfm/svnfm.git b/docs/submodules/vfc/nfvo/driver/vnfm/svnfm.git -Subproject c19faa3168f39fc4a1b239485d2bbf9e724da82 +Subproject 165e25dd14225668e05d80e2c7ae8fc2daebd48 diff --git a/docs/submodules/vfc/nfvo/lcm.git b/docs/submodules/vfc/nfvo/lcm.git -Subproject d7b47097ce93f7cfd394bafb012ccf8590f5d4a +Subproject a7bcbbec8a29579e776419e84021339c5a682ed diff --git a/docs/submodules/vid.git b/docs/submodules/vid.git -Subproject 435d688a7ae71c726ca7e96f8d0bb61d01afb59 +Subproject 39b185a11e5978991eedd4763415eed51b7c946 diff --git a/docs/submodules/vnfrqts/requirements.git b/docs/submodules/vnfrqts/requirements.git -Subproject ce06279cbf236aa79b76473747b7433ce39fb69 +Subproject 6fdbe45bdd0539c5ae34aff70c98b085eef88b9 diff --git a/docs/submodules/vnfrqts/testcases.git b/docs/submodules/vnfrqts/testcases.git -Subproject 726fd64acda27c2d1eca946284c69ba646b97cb +Subproject 9dc950cfd200fc107e1a9c96da0434b904963d6 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 = |
