Merge "Committer promotion - Andreas Geissler" elalto.1.5.2
authorSofia Wallin <sofia.wallin@est.tech>
Mon, 16 Sep 2019 14:52:50 +0000 (14:52 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 16 Sep 2019 14:52:50 +0000 (14:52 +0000)
49 files changed:
.gitmodules
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/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/datarouter.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/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-tosca.git
docs/submodules/sdc/sdc-workflow-designer.git
docs/submodules/sdnc/oam.git
docs/submodules/so.git
docs/submodules/usecase-ui.git
docs/submodules/vfc/nfvo/lcm.git
docs/submodules/vid.git
docs/submodules/vnfrqts/requirements.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 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 5ef26dc..7afca63 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 5ef26dcdd8588ec7956c713c2777dd4f0a617988
+Subproject commit 7afca63faf20cf6ee680f80e08d4cfebecbab9c8
index f2c1c95..1519246 160000 (submodule)
@@ -1 +1 @@
-Subproject commit f2c1c952765c0a4df2545ebec7b7f6e5c59617b1
+Subproject commit 151924670b390b8811283802ae7e20c3d63505da
index 6989e98..b06633f 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 6989e98ea8d2293aa90aacc1b864fb724643156e
+Subproject commit b06633f6726680f878a4dda1bc0545f072872d23
index 6c30486..0988e96 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 6c30486a840c613628c0b560c0b932536fd65efd
+Subproject commit 0988e9613f00ca1885396a64f27bff2daffb9787
index 1a7d92d..799f04c 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 1a7d92d35a4fdadd162b2eece4a75c04037b9c7e
+Subproject commit 799f04c129b09d29ebd1b87092dea699a4174d11
index 70638d1..2ac46fd 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 70638d1eb225acbc61e00ddbf9356aef38e8f143
+Subproject commit 2ac46fd53461288d5d99a9c0ebb8a3a5216db2a7
index 6cbe476..3948e2a 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 6cbe47603a3c6f6d18f5b21a994448d4e5cc0c32
+Subproject commit 3948e2a63a58dbc3e1fec980971a1756fafb2388
index 148c153..a6557cb 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 148c15375d3ad12783451c65d092c66c96360357
+Subproject commit a6557cbba03576e7593160fd2a6abe68f0af86b3
index bed9588..e45b6a2 160000 (submodule)
@@ -1 +1 @@
-Subproject commit bed9588ef11d6b212d3501d1b81ce3a10051a155
+Subproject commit e45b6a2c0f8efcbf73ece25bfebbec8d6624525e
index 85b8365..ee9341e 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 85b8365c69b25191ba53390ba8ae9c7ad8e9f18b
+Subproject commit ee9341e37f22c8cef87c48569ffdff1057c27ebe
index c3a2bbc..c21049b 160000 (submodule)
@@ -1 +1 @@
-Subproject commit c3a2bbc077e0d605477b1ff9d6f5590182c8a1b1
+Subproject commit c21049bc20ed301a0bfe4680a7924b0f91ea9023
index 3c86358..27cbec7 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 3c86358f306e61bcc7d8f3143977a55faa0f4e62
+Subproject commit 27cbec79e30f7e25a7419be38dd9bb7c324c782c
index a050aba..91b170c 160000 (submodule)
@@ -1 +1 @@
-Subproject commit a050aba6575423744b4d34df79aac857c25547ef
+Subproject commit 91b170c9334feaef47273b51f69c1471171464a4
index 0143ffd..1bba7ea 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 0143ffd31b5ed4e7018ceefae599010819ffa359
+Subproject commit 1bba7ea8b9109e23c48af2a435745553f581f1b9
index 79f3b3c..029b529 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 79f3b3c261e88c5b83227911d49957a546b1f0b5
+Subproject commit 029b5296b1bc070be3f1718190c50a1d58a2ecfa
index 67de4dd..ab38dd3 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 67de4dddc1903056e64dd87a5499ae30884031fc
+Subproject commit ab38dd33bc35ae61fc40d5c4a090a21cb214078c
index 6e7e055..97919e8 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 6e7e055e27731b451437aefa336d382f31cbc38c
+Subproject commit 97919e81b8721ae451d3c18d6b5b16ea3b4566f3
index cce9554..80edd8f 160000 (submodule)
@@ -1 +1 @@
-Subproject commit cce9554c9771c0227edc17181c2011d28a9c052b
+Subproject commit 80edd8f2f5fd4c03b8492795d864e3c79487dc7b
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..cd7e6ff
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit cd7e6ff91caf2388a041ef670d22504874a0bc5e
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..a0335b4 160000 (submodule)
@@ -1 +1 @@
-Subproject commit ccd7fa20d6d02cb2e68c0c5955bb54d95dcb74e3
+Subproject commit a0335b463c3df8d9c13ff55991d8b3bd0861e3fd
index aa74454..35a4efa 160000 (submodule)
@@ -1 +1 @@
-Subproject commit aa7445448861c403c082b20a372c4d5abb35e0ee
+Subproject commit 35a4efa3c81e966968c9742762fbf5d78db8c643
index 94174f1..7c1fb25 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 94174f17d9bbc8187f668e1656527473c38e9d4c
+Subproject commit 7c1fb25948c06e4e0b572241ae292fc31a4f4af1
index 6aad1c6..08a17c9 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 6aad1c6198726b0e7963db363ea0cfc28e93fcd5
+Subproject commit 08a17c93ecd50971172026dafb5456f41040ea1a
index e1365f3..73e7177 160000 (submodule)
@@ -1 +1 @@
-Subproject commit e1365f396668e87673f477cd620aa6df3fbf0628
+Subproject commit 73e71776a0036eeb5eff5a92eb15145ce1644eea
index 1da8b7a..37baf49 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 1da8b7af533aa48450d42219f0615d0bb510da4a
+Subproject commit 37baf499bd05b499b1fb8194266fe93dcfbd0b51
index 05d1e18..835f29f 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 05d1e18373779df333d1f1fa30cc4891a8da59a4
+Subproject commit 835f29fe2fabbaa1d2c12f931166f78c8007aae6
index 4337dfb..c630070 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 4337dfb81c893522af34e9869f65f5a73b72d7b5
+Subproject commit c630070a3e37615c23456e080322fb25d9bace3d
index c7ebafd..b66330d 160000 (submodule)
@@ -1 +1 @@
-Subproject commit c7ebafd4e235416090ddcea8eadc37ffad53bdc9
+Subproject commit b66330d7b5382aff22d3b29d542c6d2fe2d72abe
index 2f6374a..8b0f5cc 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 2f6374abde13a8e62e15387690b9f0cc1981814f
+Subproject commit 8b0f5cc7be20fe5868319c8f720aff02a3db1333
index f5527a4..5fe839b 160000 (submodule)
@@ -1 +1 @@
-Subproject commit f5527a452de839357e3bcd1a1d93d152de4958a1
+Subproject commit 5fe839bc8f5b536d5cb48297cf16c4d63e456413
index 1da40f4..b5cc5d6 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 1da40f4a4b7cf94afc034bfbc078f09921d92fc6
+Subproject commit b5cc5d63befc07120d0856a0e09b645aff88e4a3
index a6906f0..75b5636 160000 (submodule)
@@ -1 +1 @@
-Subproject commit a6906f05493e09a0a0787ac5dbd3066407b13827
+Subproject commit 75b5636a5ecb293b021409e287d4c22481c1aa90
index e19def0..d587783 160000 (submodule)
@@ -1 +1 @@
-Subproject commit e19def08fa82176057e23ee54f0fb5130a619354
+Subproject commit d587783f089e834be0f568fe6ba30a3dc710199a
index 61ccc9e..0107aa9 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 61ccc9e58b55d96330892231047a239dadf409a0
+Subproject commit 0107aa9f0f2101110e3d1a79602a3e663bbbf8c8
index f4be5f4..454e342 160000 (submodule)
@@ -1 +1 @@
-Subproject commit f4be5f4fbf547700a2caa24626d4ab184f563ba0
+Subproject commit 454e3427c79eb811db3427bc992e136f84fe3a00
index 27b5bda..80d6f2f 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 27b5bdaeac9d4606348437db862fe8295b977920
+Subproject commit 80d6f2f06e538dbb212f968514f0943bb7dd41ba
index 0b7a31d..8e369eb 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 0b7a31d8663a5124da9a443f1c0147d5bd68bf27
+Subproject commit 8e369eb5aff2699160f565a1c388fc1509057262
index a6126f7..6cd75e7 160000 (submodule)
@@ -1 +1 @@
-Subproject commit a6126f7c94e5ab9454066e69083e9955589f3402
+Subproject commit 6cd75e78667cd31930a696d4d48eabcfff2abb82
index 435d688..6e08835 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 435d688a7ae71c726ca7e96f8d0bb61d01afb592
+Subproject commit 6e08835bcfe44b02f73d349b0d87aa3591bc45e4
index ce06279..edcc809 160000 (submodule)
@@ -1 +1 @@
-Subproject commit ce06279cbf236aa79b76473747b7433ce39fb69e
+Subproject commit edcc80916503fa6a91d1ac39a11dc413e039075a
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 =