Merge "Added notes for 3rd Party Service Creation"

diff --git a/docs/guides/onap-user/design/index.rst b/docs/guides/onap-user/design/index.rst
index 6964740..b003e55 100644 (file)
--- a/docs/guides/onap-user/design/index.rst
+++ b/docs/guides/onap-user/design/index.rst
@@ -113,7 +113,7 @@ The follwing sections will focus on the different Design steps:
 
    Governance Approval and Service Distribution <./service-distribution/index.rst>
 
-   VNF parameter assignment templating <./parameter_resolution/index.rst>
+   VNF parameter resolution Design <./parameter_resolution/index.rst>
 
    Policy Design <../../../submodules/policy/parent.git/docs/design/design.rst>
 

diff --git a/docs/guides/onap-user/design/parameter_resolution/index.rst b/docs/guides/onap-user/design/parameter_resolution/index.rst
index 58bc82a..a62b3dd 100644 (file)
--- a/docs/guides/onap-user/design/parameter_resolution/index.rst
+++ b/docs/guides/onap-user/design/parameter_resolution/index.rst
@@ -605,6 +605,126 @@ to perform a "GET" on the request to check the result.
       -H 'X-TransactionId: get_aai_subscr' \
       -H 'cache-control: no-cache'
 
+
+To delete the service instance, just add the service_instance_id in the URL and
+send a DELETE operation.
+
+
+::
+
+   curl -X DELETE \
+   http://so.api.simpledemo.onap.org:30277/onap/so/infra/serviceInstantiation/v7/serviceInstances/{{service_instance_Id}} \
+   -H 'Accept: application/json' \
+   -H 'Authorization: Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==' \
+   -H 'Content-Type: application/json' \
+   -H 'X-ONAP-PartnerName: NBI' \
+   -H 'cache-control: no-cache' \
+   -d '{
+      "requestDetails": {
+         "subscriberInfo": {
+               "globalSubscriberId": "JohnDoe"
+         },
+         "requestInfo": {
+               "suppressRollback": false,
+               "productFamilyId": "Useless_But_Mandatory",
+               "requestorId": "adt",
+               "instanceName": "My_ubuntuCDS_service_instance_001",
+               "source": "VID"
+         },
+         "cloudConfiguration": {
+               "lcpCloudRegionId": "RegionOne",
+               "tenantId": "71cf9d931d9e4b8e9fcca50d97c1cf96",
+               "cloudOwner": "ONAP"
+         },
+         "requestParameters": {
+               "subscriptionServiceType": "ubuntuCDS",
+               "userParams": [
+                  {
+                     "Homing_Solution": "none"
+                  },
+                  {
+                     "service": {
+                           "instanceParams": [],
+                           "instanceName": "My_ubuntuCDS_service_instance_001",
+                           "resources": {
+                              "vnfs": [
+                                 {
+                                       "modelInfo": {
+                                          "modelName": "ubuntuCDS",
+                                          "modelVersionId": "c6a5534e-76d5-4128-97bf-ad3b72208d53",
+                                          "modelInvariantUuid": "ed3064e7-62c0-494c-bb9b-4f56d1ad157e",
+                                          "modelVersion": "1.0",
+                                          "modelCustomizationId": "6a32fb56-191e-4d11-a0cc-44b779aba4fc",
+                                          "modelInstanceName": "ubuntuCDS 0"
+                                       },
+                                       "cloudConfiguration": {
+                                          "lcpCloudRegionId": "RegionOne",
+                                          "tenantId": "71cf9d931d9e4b8e9fcca50d97c1cf96"
+                                       },
+                                       "platform": {
+                                          "platformName": "Useless_But_Mandatory"
+                                       },
+                                       "productFamilyId": "Useless_But_Mandatory",
+                                       "instanceName": "My_VNF_ubuntuCDS_instance_001",
+                                       "instanceParams": [
+                                          {
+                                             "vnf_name": "My_VNF_ubuntuCDS_instance_001"
+                                          }
+                                       ],
+                                       "vfModules": [
+                                          {
+                                             "modelInfo": {
+                                                   "modelName": "Ubuntucds..base_ubuntuCDS..module-0",
+                                                   "modelVersionId": "3025cd36-b170-4667-abb1-2bae1f297844",
+                                                   "modelInvariantUuid": "0101f9e0-7beb-4b58-92c7-ba3324b5a54d",
+                                                   "modelVersion": "1",
+                                                   "modelCustomizationId": "9bca4d4b-e27c-4652-a61e-b1b4ebca503d"
+                                             },
+                                             "instanceName": "My_vfModule_ubuntuCDS_instance_001",
+                                             "instanceParams": [
+                                                   {
+                                                      "vnf_name": "My_VNF_ubuntuCDS_instance_001",
+                                                      "vf_module_name": "My_vfModule_ubuntuCDS_instance_001",
+                                                      "ubuntuCDS_pub_key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDY15cdBmIs2XOpe4EiFCsaY6bmUmK/GysMoLl4UG51JCfJwvwoWCoA+6mDIbymZxhxq9IGxilp/yTA6WQ9s/5pBag1cUMJmFuda9PjOkXl04jgqh5tR6I+GZ97AvCg93KAECis5ubSqw1xOCj4utfEUtPoF1OuzqM/lE5mY4N6VKXn+fT7pCD6cifBEs6JHhVNvs5OLLp/tO8Pa3kKYQOdyS0xc3rh+t2lrzvKUSWGZbX+dLiFiEpjsUL3tDqzkEMNUn4pdv69OJuzWHCxRWPfdrY9Wg0j3mJesP29EBht+w+EC9/kBKq+1VKdmsXUXAcjEvjovVL8l1BrX3BY0R8D imported-openssh-key",
+                                                      "ubuntuCDS_image_name": "ubuntu-18.04-daily",
+                                                      "ubuntuCDS_flavor_name": "onap.small",
+                                                      "ubuntuCDS_name_0": "ubuntuCDS-VM-001",
+                                                      "admin_plane_net_name": "admin"
+                                                   }
+                                             ]
+                                          }
+                                       ]
+                                 }
+                              ]
+                           },
+                           "modelInfo": {
+                              "modelVersion": "1.0",
+                              "modelVersionId": "10369444-1e06-4d5d-974b-362bcfd19533",
+                              "modelInvariantId": "32e00b49-eff8-443b-82a8-b75fbb6e3867",
+                              "modelName": "ubuntuCDS",
+                              "modelType": "service"
+                           }
+                     }
+                  }
+               ],
+               "aLaCarte": false,
+               "usePreload": false
+         },
+         "owningEntity": {
+               "owningEntityId": "Useless_But_Mandatory",
+               "owningEntityName": "Useless_But_Mandatory"
+         },
+         "modelInfo": {
+               "modelVersion": "1.0",
+               "modelVersionId": "10369444-1e06-4d5d-974b-362bcfd19533",
+               "modelInvariantId": "32e00b49-eff8-443b-82a8-b75fbb6e3867",
+               "modelName": "ubuntuCDS",
+               "modelType": "service"
+         }
+      }
+   }'
+
+
 Trouble shooting
 ----------------
 

diff --git a/docs/submodules/aaf/authz.git b/docs/submodules/aaf/authz.git
index 488d383..deb396a 160000 (submodule)
--- a/docs/submodules/aaf/authz.git
+++ b/docs/submodules/aaf/authz.git
@@ -1 +1 @@
-Subproject commit 488d383a56cd503e3b4d3508640693d5c8e0d335
+Subproject commit deb396a3d53a84b2eb5a46d40122b4902d72c601

diff --git a/docs/submodules/aai/sparky-be.git b/docs/submodules/aai/sparky-be.git
index 4b7b80b..3aadc45 160000 (submodule)
--- a/docs/submodules/aai/sparky-be.git
+++ b/docs/submodules/aai/sparky-be.git
@@ -1 +1 @@
-Subproject commit 4b7b80bef8eb432fbcd82489fcd13263a3a26a8e
+Subproject commit 3aadc4547b62d205b488ece3d8d7c01e1d906a5a

diff --git a/docs/submodules/appc.git b/docs/submodules/appc.git
index cea67fa..0682bef 160000 (submodule)
--- a/docs/submodules/appc.git
+++ b/docs/submodules/appc.git
@@ -1 +1 @@
-Subproject commit cea67fafd905f169b8db5c4be0b47959b66c32e3
+Subproject commit 0682bef2851542f431b5c86a1cad2a28f5479eee

diff --git a/docs/submodules/appc/deployment.git b/docs/submodules/appc/deployment.git
index 9088a0f..7bbb02c 160000 (submodule)
--- a/docs/submodules/appc/deployment.git
+++ b/docs/submodules/appc/deployment.git
@@ -1 +1 @@
-Subproject commit 9088a0f0a6fb4fe1b90484435a8e766e6fe1217a
+Subproject commit 7bbb02c6b894d63e39dfbe6dc8f59cd7bad7e748

diff --git a/docs/submodules/ccsdk/apps.git b/docs/submodules/ccsdk/apps.git
index f2c0919..63bf77e 160000 (submodule)
--- a/docs/submodules/ccsdk/apps.git
+++ b/docs/submodules/ccsdk/apps.git
@@ -1 +1 @@
-Subproject commit f2c0919500a71b911f30c39577aea7bc7911ba98
+Subproject commit 63bf77ea55f2dd15ef5ce0b2640e93dfbea5f21e

diff --git a/docs/submodules/ccsdk/cds.git b/docs/submodules/ccsdk/cds.git
index 9883136..d4fadc9 160000 (submodule)
--- a/docs/submodules/ccsdk/cds.git
+++ b/docs/submodules/ccsdk/cds.git
@@ -1 +1 @@
-Subproject commit 98831362ddb13e1888bedca4f4e03df8c4e7d9e4
+Subproject commit d4fadc988246eb172ce8333bb3a06443591c5f19

diff --git a/docs/submodules/ccsdk/distribution.git b/docs/submodules/ccsdk/distribution.git
index 19b186c..aeff1a0 160000 (submodule)
--- a/docs/submodules/ccsdk/distribution.git
+++ b/docs/submodules/ccsdk/distribution.git
@@ -1 +1 @@
-Subproject commit 19b186c0d91e489672e71ddd1e76c7b9f56c9a91
+Subproject commit aeff1a04d07b6b2dea436189036a9bde1719d456

diff --git a/docs/submodules/ccsdk/features.git b/docs/submodules/ccsdk/features.git
index 03c25f0..4aadd73 160000 (submodule)
--- a/docs/submodules/ccsdk/features.git
+++ b/docs/submodules/ccsdk/features.git
@@ -1 +1 @@
-Subproject commit 03c25f06baef3d96cf888363dc26b09695337c8e
+Subproject commit 4aadd732e162ba6b11f348e758f21f4ff5533e2a

diff --git a/docs/submodules/clamp.git b/docs/submodules/clamp.git
index 876d1a4..4d8c1ab 160000 (submodule)
--- a/docs/submodules/clamp.git
+++ b/docs/submodules/clamp.git
@@ -1 +1 @@
-Subproject commit 876d1a49367b4614680954913590372d773ec8ec
+Subproject commit 4d8c1ab21a3f5baf82a91a3cc9ab2af8823e6e34

diff --git a/docs/submodules/cli.git b/docs/submodules/cli.git
index 55fce92..d5155b5 160000 (submodule)
--- a/docs/submodules/cli.git
+++ b/docs/submodules/cli.git
@@ -1 +1 @@
-Subproject commit 55fce92ca633352b745276c23467770838e687c7
+Subproject commit d5155b512337ebb873c4c7a5072ef9524b770bc1

diff --git a/docs/submodules/dcaegen2.git b/docs/submodules/dcaegen2.git
index d10bd6a..01ccd8d 160000 (submodule)
--- a/docs/submodules/dcaegen2.git
+++ b/docs/submodules/dcaegen2.git
@@ -1 +1 @@
-Subproject commit d10bd6a5350ae9284b0fd16a0bb53ce4f3ae24bf
+Subproject commit 01ccd8dffe8b1dc3610711f455a2b90d3d77426d

diff --git a/docs/submodules/externalapi/nbi.git b/docs/submodules/externalapi/nbi.git
index d793577..724b502 160000 (submodule)
--- a/docs/submodules/externalapi/nbi.git
+++ b/docs/submodules/externalapi/nbi.git
@@ -1 +1 @@
-Subproject commit d7935777c8d4ad54e810ec926e6ef8358eb7a455
+Subproject commit 724b5025cd16fbed0bba66e21129fd9530ce736d

diff --git a/docs/submodules/integration.git b/docs/submodules/integration.git
index be1df2c..73c4103 160000 (submodule)
--- a/docs/submodules/integration.git
+++ b/docs/submodules/integration.git
@@ -1 +1 @@
-Subproject commit be1df2cdc3e8f2b16cd007dcdb59c8093024a0a3
+Subproject commit 73c410322a99c154b3241167f992e28f0b495449

diff --git a/docs/submodules/logging-analytics.git b/docs/submodules/logging-analytics.git
index fbe7e0d..ade7ef2 160000 (submodule)
--- a/docs/submodules/logging-analytics.git
+++ b/docs/submodules/logging-analytics.git
@@ -1 +1 @@
-Subproject commit fbe7e0db7cc591990c379ac1516be7a4433fe01c
+Subproject commit ade7ef267161cb22cc2834e44dc6bde0597884f5

diff --git a/docs/submodules/modeling/etsicatalog.git b/docs/submodules/modeling/etsicatalog.git
index 06bfcce..5f632e3 160000 (submodule)
--- a/docs/submodules/modeling/etsicatalog.git
+++ b/docs/submodules/modeling/etsicatalog.git
@@ -1 +1 @@
-Subproject commit 06bfcce3f57176e6b428e43e8e411e245a5fa75e
+Subproject commit 5f632e314dcb48bcf30596ef2a2c0af60e836c3c

diff --git a/docs/submodules/multicloud/azure.git b/docs/submodules/multicloud/azure.git
index 6d9ccde..7a3a6dd 160000 (submodule)
--- a/docs/submodules/multicloud/azure.git
+++ b/docs/submodules/multicloud/azure.git
@@ -1 +1 @@
-Subproject commit 6d9ccdecad90a77b9e0f9e37ea9a2c61321b9891
+Subproject commit 7a3a6dd01cf1180bc33b8e6b1224d9cf595dbe57

diff --git a/docs/submodules/multicloud/framework.git b/docs/submodules/multicloud/framework.git
index fc2a18c..2ce0d6f 160000 (submodule)
--- a/docs/submodules/multicloud/framework.git
+++ b/docs/submodules/multicloud/framework.git
@@ -1 +1 @@
-Subproject commit fc2a18c1a384786874fe2a6b0ca543dfaa16a7de
+Subproject commit 2ce0d6fc05dc109df71b87ca8350628dabaa7a6b

diff --git a/docs/submodules/multicloud/k8s.git b/docs/submodules/multicloud/k8s.git
index b86512e..88c3694 160000 (submodule)
--- a/docs/submodules/multicloud/k8s.git
+++ b/docs/submodules/multicloud/k8s.git
@@ -1 +1 @@
-Subproject commit b86512e598d5e59fe1f2048159e68dea4d229164
+Subproject commit 88c3694fa50ea8fee314752e096f8070f017ac6c

diff --git a/docs/submodules/music.git b/docs/submodules/music.git
index f85d0e6..9277729 160000 (submodule)
--- a/docs/submodules/music.git
+++ b/docs/submodules/music.git
@@ -1 +1 @@
-Subproject commit f85d0e6b4c429f66896d3dbf06b01653bc2d410b
+Subproject commit 9277729f6cd6fdc0313b98d303fddff2ca8a63af

diff --git a/docs/submodules/oom.git b/docs/submodules/oom.git
index 41041fc..8501d7c 160000 (submodule)
--- a/docs/submodules/oom.git
+++ b/docs/submodules/oom.git
@@ -1 +1 @@
-Subproject commit 41041fce7009965f5a0da872d5efa4ab1c937f38
+Subproject commit 8501d7cee5a887f9e19d5fe3671ef8180bce526b

diff --git a/docs/submodules/oom/offline-installer.git b/docs/submodules/oom/offline-installer.git
index 610ddff..d8c6d9a 160000 (submodule)
--- a/docs/submodules/oom/offline-installer.git
+++ b/docs/submodules/oom/offline-installer.git
@@ -1 +1 @@
-Subproject commit 610ddff2d54cece28af56cc7bbf01ed524ecce9c
+Subproject commit d8c6d9acfd8b74dc3f3187d069b393405e5c1b18

diff --git a/docs/submodules/optf/cmso.git b/docs/submodules/optf/cmso.git
index 614f8f9..7f2896d 160000 (submodule)
--- a/docs/submodules/optf/cmso.git
+++ b/docs/submodules/optf/cmso.git
@@ -1 +1 @@
-Subproject commit 614f8f9a33ade5b523003c9f5aa7299f11fcfc19
+Subproject commit 7f2896d3cad2819b218cfea4c5ce3a81145417af

diff --git a/docs/submodules/optf/has.git b/docs/submodules/optf/has.git
index 51204dd..fa04a4a 160000 (submodule)
--- a/docs/submodules/optf/has.git
+++ b/docs/submodules/optf/has.git
@@ -1 +1 @@
-Subproject commit 51204dd7250549d4b59c1ff2bb4f1ad44ed1b96a
+Subproject commit fa04a4a0c5a18be0c1ebaebc8721b211ff26be74

diff --git a/docs/submodules/policy/engine.git b/docs/submodules/policy/engine.git
index 58c44ae..e28d69b 160000 (submodule)
--- a/docs/submodules/policy/engine.git
+++ b/docs/submodules/policy/engine.git
@@ -1 +1 @@
-Subproject commit 58c44ae81489deca05f57812c19f25c3897fe57a
+Subproject commit e28d69bf71518b466c1b5940fa36feec94d2b60b

diff --git a/docs/submodules/policy/parent.git b/docs/submodules/policy/parent.git
index c8cccc7..21317cf 160000 (submodule)
--- a/docs/submodules/policy/parent.git
+++ b/docs/submodules/policy/parent.git
@@ -1 +1 @@
-Subproject commit c8cccc73f72f97f8cc3e8a70aed7bca2f5c3e384
+Subproject commit 21317cfb4a10da6f59376dabb59fc2dd7b60b897

diff --git a/docs/submodules/portal.git b/docs/submodules/portal.git
index df4d078..ffd9af9 160000 (submodule)
--- a/docs/submodules/portal.git
+++ b/docs/submodules/portal.git
@@ -1 +1 @@
-Subproject commit df4d078a7e3bcb1d566b0f3f69108979ecaf62d0
+Subproject commit ffd9af970318c1f5a0bad46d7aad5d4611414aae

diff --git a/docs/submodules/sdc.git b/docs/submodules/sdc.git
index 1bb3b03..78be848 160000 (submodule)
--- a/docs/submodules/sdc.git
+++ b/docs/submodules/sdc.git
@@ -1 +1 @@
-Subproject commit 1bb3b03e1ebb16f3a9937ec5ae7d3b9c4a987c40
+Subproject commit 78be848fcf71bf970cf4de16e22a37e09edeaaa7

diff --git a/docs/submodules/sdc/sdc-workflow-designer.git b/docs/submodules/sdc/sdc-workflow-designer.git
index 46d80b9..0807428 160000 (submodule)
--- a/docs/submodules/sdc/sdc-workflow-designer.git
+++ b/docs/submodules/sdc/sdc-workflow-designer.git
@@ -1 +1 @@
-Subproject commit 46d80b9ef559fab3fa585ea3259b2bd4b1ee6d9d
+Subproject commit 0807428b00747e344a727318f4959962ef47a7f0

diff --git a/docs/submodules/sdnc/oam.git b/docs/submodules/sdnc/oam.git
index 484d745..ba38487 160000 (submodule)
--- a/docs/submodules/sdnc/oam.git
+++ b/docs/submodules/sdnc/oam.git
@@ -1 +1 @@
-Subproject commit 484d74555c481f055a7f33909071962cace85aa0
+Subproject commit ba38487742d73c22b6185978f0b8f821a4d94640

diff --git a/docs/submodules/so.git b/docs/submodules/so.git
index 824b38d..02c068c 160000 (submodule)
--- a/docs/submodules/so.git
+++ b/docs/submodules/so.git
@@ -1 +1 @@
-Subproject commit 824b38dceab0fe94c3d80be31e48580609620641
+Subproject commit 02c068ce771ee4522936f2d15f41c2b631e965a8

diff --git a/docs/submodules/usecase-ui.git b/docs/submodules/usecase-ui.git
index da093f6..bc115d8 160000 (submodule)
--- a/docs/submodules/usecase-ui.git
+++ b/docs/submodules/usecase-ui.git
@@ -1 +1 @@
-Subproject commit da093f61a37cf58c4ed788f58f4e78b3aadc1859
+Subproject commit bc115d88c7cbb728880839dd5e32987db167234b

diff --git a/docs/submodules/vid.git b/docs/submodules/vid.git
index 3250d40..9663f22 160000 (submodule)
--- a/docs/submodules/vid.git
+++ b/docs/submodules/vid.git
@@ -1 +1 @@
-Subproject commit 3250d40c952004bb08a1f54dcc7f816a9de09e1f
+Subproject commit 9663f222f044e52338fa1dba3950a26e665bfba4

diff --git a/docs/submodules/vnfrqts/requirements.git b/docs/submodules/vnfrqts/requirements.git
index 9b71772..e9bd36e 160000 (submodule)
--- a/docs/submodules/vnfrqts/requirements.git
+++ b/docs/submodules/vnfrqts/requirements.git
@@ -1 +1 @@
-Subproject commit 9b71772ee7fcdcc3771b777dac66946234e55777
+Subproject commit e9bd36e303a108dfd5db32487521421c0aa7ee46