Merge "sdnc preload change (http to https, port 30202 to 30267) Issue-ID: DOC-542"
authorEric Debeau <eric.debeau@orange.com>
Sat, 5 Oct 2019 11:20:31 +0000 (11:20 +0000)
committerGerrit Code Review <gerrit@onap.org>
Sat, 5 Oct 2019 11:20:31 +0000 (11:20 +0000)
62 files changed:
.gitmodules
INFO.yaml
docs/guides/onap-user/design/index.rst
docs/guides/onap-user/design/media/Design-Overview.png [changed mode: 0644->0755]
docs/guides/onap-user/design/media/Design-Overview.pptx [new file with mode: 0755]
docs/release/repolist.rst
docs/submodules/aaf/authz.git
docs/submodules/aai/aai-common.git
docs/submodules/appc.git
docs/submodules/appc/deployment.git
docs/submodules/ccsdk/apps.git
docs/submodules/ccsdk/cds.git
docs/submodules/ccsdk/dashboard.git
docs/submodules/ccsdk/distribution.git
docs/submodules/ccsdk/features.git
docs/submodules/ccsdk/parent.git
docs/submodules/ccsdk/platform/plugins.git
docs/submodules/ccsdk/utils.git
docs/submodules/clamp.git
docs/submodules/cli.git
docs/submodules/dcaegen2.git
docs/submodules/dmaap/buscontroller.git
docs/submodules/dmaap/datarouter.git
docs/submodules/dmaap/dbcapi.git
docs/submodules/dmaap/messagerouter/messageservice.git
docs/submodules/externalapi/nbi.git
docs/submodules/integration.git
docs/submodules/logging-analytics.git
docs/submodules/logging-analytics/pomba/pomba-audit-common.git
docs/submodules/modeling/etsicatalog.git [new submodule]
docs/submodules/modeling/genericparser.git [deleted submodule]
docs/submodules/modeling/modelspec.git
docs/submodules/msb/apigateway.git
docs/submodules/msb/discovery.git
docs/submodules/msb/java-sdk.git
docs/submodules/msb/swagger-sdk.git
docs/submodules/multicloud/framework.git
docs/submodules/multicloud/k8s.git
docs/submodules/music.git
docs/submodules/oom.git
docs/submodules/oom/offline-installer.git
docs/submodules/optf/cmso.git
docs/submodules/optf/has.git
docs/submodules/policy/engine.git
docs/submodules/policy/parent.git
docs/submodules/portal.git
docs/submodules/sdc.git
docs/submodules/sdc/sdc-distribution-client.git
docs/submodules/sdc/sdc-docker-base.git
docs/submodules/sdc/sdc-tosca.git
docs/submodules/sdc/sdc-workflow-designer.git
docs/submodules/sdnc/oam.git
docs/submodules/so.git
docs/submodules/so/libs.git
docs/submodules/usecase-ui.git
docs/submodules/vfc/nfvo/driver/vnfm/svnfm.git
docs/submodules/vfc/nfvo/lcm.git
docs/submodules/vid.git
docs/submodules/vnfrqts/requirements.git
docs/submodules/vnfrqts/testcases.git
docs/submodules/vvp/documentation.git
tox.ini

index 5193b04..ed846d4 100644 (file)
        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
index f60e195..25a7291 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -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:
index a779844..29d166c 100644 (file)
@@ -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>
 
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
index 9f59f00..30d9400 100644 (file)
@@ -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>
index 128345f..6b7b912 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 128345fbbf2fe28d65899c4c0a02ff063a978076
+Subproject commit 6b7b912348ae60b2217af57749ac00a67080bf12
index 2ce7db3..5c3e18d 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 2ce7db31da64936d47ec8e211962e1472ceda41d
+Subproject commit 5c3e18d49e9792c8b8e502d5b629ed81b51ff099
index f2c1c95..c471ec3 160000 (submodule)
@@ -1 +1 @@
-Subproject commit f2c1c952765c0a4df2545ebec7b7f6e5c59617b1
+Subproject commit c471ec3ab07ef9fc085748c1364215c18963f169
index b8e46a8..94682f1 160000 (submodule)
@@ -1 +1 @@
-Subproject commit b8e46a813a4c1810e9845d2013611d02da129d1b
+Subproject commit 94682f124d792fee71f78bd9c3fce7a4e94d26ba
index 6c30486..08409f0 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 6c30486a840c613628c0b560c0b932536fd65efd
+Subproject commit 08409f0df6ba46e2e2b8ac4886c6727b4169c6f6
index 16dfa23..809993f 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 16dfa234954d54334f73b2a5c0ed3da47ff27c13
+Subproject commit 809993fe658026f4cb953e49ab0331e2d4e5c8f8
index 70638d1..2ac46fd 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 70638d1eb225acbc61e00ddbf9356aef38e8f143
+Subproject commit 2ac46fd53461288d5d99a9c0ebb8a3a5216db2a7
index 6cbe476..2951652 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 6cbe47603a3c6f6d18f5b21a994448d4e5cc0c32
+Subproject commit 2951652d185277ccbf36e7b53df014b895889b71
index 4b8e365..a6557cb 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 4b8e365a78261942cb7b8384d5138d9e5056898a
+Subproject commit a6557cbba03576e7593160fd2a6abe68f0af86b3
index bed9588..632a1f3 160000 (submodule)
@@ -1 +1 @@
-Subproject commit bed9588ef11d6b212d3501d1b81ce3a10051a155
+Subproject commit 632a1f3cc13664249eb6f7f95d19ded659d1b98b
index 85b8365..b50321b 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 85b8365c69b25191ba53390ba8ae9c7ad8e9f18b
+Subproject commit b50321b613a139d7cb1732d1814194bafb657430
index c3a2bbc..c21049b 160000 (submodule)
@@ -1 +1 @@
-Subproject commit c3a2bbc077e0d605477b1ff9d6f5590182c8a1b1
+Subproject commit c21049bc20ed301a0bfe4680a7924b0f91ea9023
index 3c86358..9961ca6 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 3c86358f306e61bcc7d8f3143977a55faa0f4e62
+Subproject commit 9961ca616538f9fd3931d03cf2aec9344c11609d
index 97830fd..a52f00e 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 97830fdd6e1b596219f8759716c75776ba10121f
+Subproject commit a52f00e9d0af1181d3e9c87508789fb4ced022f5
index 0143ffd..1bba7ea 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 0143ffd31b5ed4e7018ceefae599010819ffa359
+Subproject commit 1bba7ea8b9109e23c48af2a435745553f581f1b9
index ab4d78a..2d14d6d 160000 (submodule)
@@ -1 +1 @@
-Subproject commit ab4d78a462a8110cae9278c13fbfccb3d34f208c
+Subproject commit 2d14d6dff3456430022efe6cf3607c9f8794a297
index 18e2259..029b529 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 18e2259469f0185c12f7c63e91d8f1ac82979d1d
+Subproject commit 029b5296b1bc070be3f1718190c50a1d58a2ecfa
index 26a7eb9..8b4d210 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 26a7eb9dea0fb9726d696422f8de54a8ac198994
+Subproject commit 8b4d21007bdd969b059906385d8b887c767b2478
index 5578af7..681bcde 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 5578af7e4d0347428f3cb1ac12d0ffd1dab7b1cf
+Subproject commit 681bcde4445437de3b0d826c3e8e4af6231a174b
index 746d161..ab38dd3 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 746d161edf22f10fd96a158fa7001f74b21d680d
+Subproject commit ab38dd33bc35ae61fc40d5c4a090a21cb214078c
index 6e7e055..383a3e8 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 6e7e055e27731b451437aefa336d382f31cbc38c
+Subproject commit 383a3e820a83c7c526aee35312a94a923a53022c
index cce9554..68a5ea0 160000 (submodule)
@@ -1 +1 @@
-Subproject commit cce9554c9771c0227edc17181c2011d28a9c052b
+Subproject commit 68a5ea019002d9d62342ddf35351fcfccf9b0ad8
index 8c337af..01494f4 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 8c337af8afa9e736b7503291e836ff993fff326e
+Subproject commit 01494f43edc57440e89f026284c5280ec0228244
diff --git a/docs/submodules/modeling/etsicatalog.git b/docs/submodules/modeling/etsicatalog.git
new file mode 160000 (submodule)
index 0000000..9ec0fc3
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit 9ec0fc3a923179d97c1610f44641b7a43c306b8f
diff --git a/docs/submodules/modeling/genericparser.git b/docs/submodules/modeling/genericparser.git
deleted file mode 160000 (submodule)
index 05947d6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 05947d61cb8643ab41a394154ea8b73f12fb32fd
index ccd7fa2..6005b1a 160000 (submodule)
@@ -1 +1 @@
-Subproject commit ccd7fa20d6d02cb2e68c0c5955bb54d95dcb74e3
+Subproject commit 6005b1ac5b91162a73798d683acb0039f07d9de6
index a05a45f..2b5b62d 160000 (submodule)
@@ -1 +1 @@
-Subproject commit a05a45fe19bcae74be121b3b91bc8dd9ff6f7d7e
+Subproject commit 2b5b62d268373e499e261416c6828591ff04246f
index eda17e6..4809cc1 160000 (submodule)
@@ -1 +1 @@
-Subproject commit eda17e6ca39df76404df3cd0d8ff482a84d03b29
+Subproject commit 4809cc1162e266a220e1b125309a3166e1d9cceb
index 78852e4..c9d4124 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 78852e4f3a551022b311499c9f837dc581d776e1
+Subproject commit c9d41241f6052c0838a8b8a1e63d0c25958b3cab
index 765d63d..d9bc68b 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 765d63dd4d609d498f89c6cb310d6b8e73ab9491
+Subproject commit d9bc68bc2f78420ce07cc2d5d320c2c5d30ad68a
index 78920e6..92ef113 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 78920e6afaf4b888e4e38fdf78dd24602656ea19
+Subproject commit 92ef113803cf4b31ac23a6e11d12b16e676563d1
index 77ce224..1b8bee8 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 77ce224e1b3736f0c0b398b5a5b57ea58ebbaa55
+Subproject commit 1b8bee840af30f67fcdc0d45ef9334f0461ca1c7
index 6aad1c6..a681a9e 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 6aad1c6198726b0e7963db363ea0cfc28e93fcd5
+Subproject commit a681a9e295dc2b8f35dd42251f795d0079471ac0
index 26f7c28..eeebff3 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 26f7c28c3c97b7c7300259956b4bd7b5c456d280
+Subproject commit eeebff31ba9ad1358ee97a8df37586864098304a
index 1da8b7a..ec5d45c 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 1da8b7af533aa48450d42219f0615d0bb510da4a
+Subproject commit ec5d45ce17d16982f22039409dccc756fd4a057c
index 05d1e18..8f9976f 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 05d1e18373779df333d1f1fa30cc4891a8da59a4
+Subproject commit 8f9976f2db7221fec425ff64e55bbedb6504ed20
index 4337dfb..602f77b 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 4337dfb81c893522af34e9869f65f5a73b72d7b5
+Subproject commit 602f77bf2e45936b0cd974788d2b58a5f5e2e397
index c7ebafd..ffd7241 160000 (submodule)
@@ -1 +1 @@
-Subproject commit c7ebafd4e235416090ddcea8eadc37ffad53bdc9
+Subproject commit ffd7241c7bfa8d8b68b504406fc6ed4cc299ffe6
index c0784b5..36ad194 160000 (submodule)
@@ -1 +1 @@
-Subproject commit c0784b571a00ff28117ae20d7e55cc885db71557
+Subproject commit 36ad194c41e7a0fb6adb0df707188147fdc232d0
index 485c51d..9306dd8 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 485c51d686e57d53571c9e3c64e109e67c1b6f62
+Subproject commit 9306dd8333497633a0c764998b0da528ead0ffef
index 1da40f4..003853d 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 1da40f4a4b7cf94afc034bfbc078f09921d92fc6
+Subproject commit 003853d0d95c142e857b9e73f0164123e7e685ef
index 72ebecf..701842e 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 72ebecfaa1774b909c7ece40e5124e74248cba4b
+Subproject commit 701842e370ade0354cb443c010113900bfda4497
index 639278b..6cdcb85 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 639278ba4ddea0ca7402839bc2e49ac70f2e14ef
+Subproject commit 6cdcb857261019e1dbd154fe6f27a68b124cfb4a
index e19def0..9ea78f2 160000 (submodule)
@@ -1 +1 @@
-Subproject commit e19def08fa82176057e23ee54f0fb5130a619354
+Subproject commit 9ea78f2e3ac764a0a313b356764283277bcf7023
index 61ccc9e..12d0516 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 61ccc9e58b55d96330892231047a239dadf409a0
+Subproject commit 12d0516104bae658d9a83e4eff767ac57d575556
index 49752d7..328a056 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 49752d7a66e8edf73e94fd2f7c6191dba1d2d2fc
+Subproject commit 328a0562c256b4d3781765506dded054b58c3426
index 27b5bda..6f8ed4f 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 27b5bdaeac9d4606348437db862fe8295b977920
+Subproject commit 6f8ed4f558226640d00b2069ae3e8d254364f80a
index cef3656..43e0541 160000 (submodule)
@@ -1 +1 @@
-Subproject commit cef365681191dd67ae790ba9553efd2776890a11
+Subproject commit 43e0541c889dff97f1368e0994254e26c2ccbfe6
index ed3a07f..03faffe 160000 (submodule)
@@ -1 +1 @@
-Subproject commit ed3a07f731f0c6f70234ca107ac46f44ec538faf
+Subproject commit 03faffe8da4c35f2807334489ba80eb562890d68
index c19faa3..165e25d 160000 (submodule)
@@ -1 +1 @@
-Subproject commit c19faa3168f39fc4a1b239485d2bbf9e724da829
+Subproject commit 165e25dd14225668e05d80e2c7ae8fc2daebd483
index d7b4709..a7bcbbe 160000 (submodule)
@@ -1 +1 @@
-Subproject commit d7b47097ce93f7cfd394bafb012ccf8590f5d4a4
+Subproject commit a7bcbbec8a29579e776419e84021339c5a682ed4
index 435d688..39b185a 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 435d688a7ae71c726ca7e96f8d0bb61d01afb592
+Subproject commit 39b185a11e5978991eedd4763415eed51b7c9462
index ce06279..6fdbe45 160000 (submodule)
@@ -1 +1 @@
-Subproject commit ce06279cbf236aa79b76473747b7433ce39fb69e
+Subproject commit 6fdbe45bdd0539c5ae34aff70c98b085eef88b93
index 726fd64..9dc950c 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 726fd64acda27c2d1eca946284c69ba646b97cba
+Subproject commit 9dc950cfd200fc107e1a9c96da0434b904963d6b
index 3326ce2..a6b7b70 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 3326ce230c992382896905d9b7c642faa602319c
+Subproject commit a6b7b70c273ad869f4a3ea77f9717b10cdaf1620
diff --git a/tox.ini b/tox.ini
index d1bbd48..17195d4 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -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 =