From: Eric Debeau Date: Wed, 24 Apr 2019 12:33:50 +0000 (+0000) Subject: Merge "Fix pair of typos" X-Git-Tag: elalto.1.5.2~4271 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7ad12e89b790be7e589afbbe935270caf3d07f69;hp=74a0416853a6e7e7c9a32521a5f4d9e321c3261d;p=doc.git Merge "Fix pair of typos" --- diff --git a/.gitmodules b/.gitmodules index 44d12271e..f0beb77c7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -393,3 +393,6 @@ url = ../ccsdk/features branch = . ignore = dirty +[submodule "docs/submodules/policy/parent.git"] + path = docs/submodules/policy/parent.git + url = ../policy/parent diff --git a/docs/guides/onap-user/resource-onboarding/index.rst b/docs/guides/onap-user/resource-onboarding/index.rst new file mode 100644 index 000000000..4a3cbc1e3 --- /dev/null +++ b/docs/guides/onap-user/resource-onboarding/index.rst @@ -0,0 +1,250 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 +.. International License. http://creativecommons.org/licenses/by/4.0 +.. Copyright 2019 ONAP Contributors. All rights reserved. + +Resource Onboarding +=================== +**Goal:** Add models and other artifacts required to create, configure, instantiate, and manage a VF and, optionally, a VFC. + +**Tool:** SDC + +**SDC user role:** Designer + +|image0| + +**Steps** + * `Create a License Model`_ + * `Create a License Key Group [Optional]`_ + * `Create an Entitlement Pool`_ + * `Create a Feature Group`_ + * `Create a License Agreement`_ + * `Create a Vendor Software Product`_ + * `Update VFCs in a VSP [optional]`_ + * `Update a VSP [optional]`_ + +After updating the artifacts in a VSP, also update: + * the VF created from the VSP + * any services that include the VF + +|image1| + +Create a License Model +---------------------- + +VSPs optionally require a license and entitlements to enable the service provider to track the usage. + +Note: For interim saving while creating the license model and its components, click |image2| + +**Prerequisites:** To obtain license information, contact the service provider's Supply Chain Management (SCM) group. + +|image3| + +#. From the SDC HOME page, click *ONBOARD*. +#. Hover over Add and select New License Model. +#. Complete all fields. +#. Click *Save*. +#. In the ONBOARD header, hover over the arrow after License Agreements to reveal a menu. + Select the following options in order: + + #. Create 0 or more license key groups (see `Create a License Key Group [Optional]`_). + #. Create 1 or more entitlement pools (see `Create an Entitlement Pool`_). + #. Create 1 or more feature groups (see `Create a Feature Group`_). + #. Create 1 or more license agreements (see `Create a License Agreement`_). + + Note: Perform all steps above before submitting the license model to the SDC catalog. + +#. In the header, click the license model created in steps 1 to 4. +#. Click *Check In* to save changes. +#. Click *Submit* to add the license model to the catalog. A success message displays. +#. After creating a license, complete `Create a Vendor Software Product`_ to add the VSP required for the associated VF. + +Create a License Key Group [Optional] +------------------------------------- + +If required by the resource model, create one or more license key groups; otherwise the license key group is optional. + +**Prerequisites:** `Create a License Model`_ + +|image4| + +1. From the drop-down menu, select License Key Groups. +2. Click *Add License Key Group*. + The Create New License Key Group box displays. +3. Complete all fields. + Note: Enter the manufacturer reference number in the Name field. +4. Click *Save*. + +Create an Entitlement Pool +-------------------------- + +**Prerequisites:** If required by the resource model, create one or more license key groups (see `Create a License Key Group [Optional]`_). + +|image5| + +1. From the drop-down menu, select Entitlement Pools. +2. Click *Add Entitlement Pool*. + The Create New Entitlement Pool box displays. +3. Complete required fields (mandatory fields are marked by a red asterisk). +4. Click *Save*. + +Create a Feature Group +---------------------- + +**Prerequisites:** Create one or more: + +* license key groups if required by the resource model (see `Create a License Key Group [optional]`_) +* entitlement pools (see `Create an Entitlement Pool`_) + +|image6| + +1. From the drop-down menu, select Feature Groups. +2. Click *Add Feature Group*. + The Create New Feature Group box displays. +3. On the General tab, complete all fields. +4. Click *Entitlement Pools*. +5. Click *Available Entitlement Pools*. +6. Select one or more entitlement pools and click the right arrow. +7. Click *License Key Groups*. +8. Click *Available License Key Groups*. +9. Select one or more license key groups and click the right arrow. +10. Click *Save*. + +Create a License Agreement +-------------------------- + +**Prerequisites:** Create one or more feature groups (see `Create a Feature Group`_). + +|image7| + +1. From the drop-down menu, select License Agreements. +2. Click *Add License Agreement*. + The Create New License Agreement box displays. +3. On the General tab, complete required fields (mandatory fields are marked by a red asterisk). +4. Click *Feature Groups*. +5. If not selected, click *Available Feature Groups*. +6. Select one or more groups and click the right arrow. +7. Click *Save*. +8. Return to step 5 of `Create a License Model`_ to complete the license model. + +Create a Vendor Software Product +-------------------------------- + +Create one or more Vendor Software Products (VSPs) as the building blocks for VFs. + +.. note:: + For interim saving while creating a VSP, click |image2| + +**Prerequisites:** + +* `Create a License Model`_ +* Generate manifest and package artifacts. + +#. From the SDC HOME page, click *ONBOARD*. +#. Hover over Add and select New Vendor Software Product. +#. The New Software Product box is displayed. + Complete all fields. +#. Click *Save*. + The Overview section is displayed. + + .. note:: + A warning is displayed under License Agreement if the VSP does not have an associated license. + +#. Click *Software Product Details* (left pane). + + |image8| + +#. In order, select a licensing version, a license agreement, and one or more feature groups. +#. [Optional] Complete other fields, such as Availability (high-availability zones) and Storage + Data Replication (requirement for storage replication), as required. +#. In Software Product Attachments (right pane), click *Select file*. +#. Locate a Heat .zip package and click *Open*. + SDC validates the files in the package. After successful validation, SDC displays the files + and a success message. If validation fails, SDC displays the errors in the files. + + Example Heat errors: + + |image9| + +#. Click *Check In* to save the changes. +#. Click *Submit* to add the VSP to the catalog. +#. A success message is displayed. If the VSP attachments contain errors, an error message is displayed instead. Fix the issue(s) and re-submit. +#. To configure VFCs associated with the VSP, see `Update VFCs in a VSP [optional]`_, below. + + +Update VFCs in a VSP [optional] +------------------------------- + +If required, configure Virtual Function Components (VFCs) associated with a VSP, such as the Hypervisor, VM recovery details, and cloning. VFCs are listed on the Components tab. + +.. note:: + All fields are optional. Answers to questionnaires are stored as metadata only on the SDC platform. + +**Prerequisites:** Add one or more VSPs (see `Create a Vendor Software Product`_). + +#. From the SDC HOME page, click *ONBOARD* and search for a VSP. +#. In the Overview section, click *Check Out*. +#. In Components (bottom pane), click a VFC (VSP component). + The component links display in the left pane. +#. Click *General* to view and edit general parameters such as hypervisor, image format, VM recovery details, and DNS configuration. +#. Click *Compute* to view and edit VM parameters such as the number of VMs required for a VFC instance and persistent storage/volume size. +#. Click *High Availability & Load Balancing* to answer questions related to VM availability and load balancing. +#. Click *Networks* to view or edit parameters related to network capacity and interfaces. + + .. note:: + Click an interface to view or edit it. A dialog box displays similar to the figure below. + + |image10| + +#. Click *Storage* to configure storage information, such as backup type, storage size, and logging. +#. Click *Process Details*, click *Add Component Process Details*, and complete the Create New Process Details dialog box. Use Process Details to identify the processes and configuration associated with VFCs. +#. Click *Monitoring* to upload MIB or JSON files for SNMP traps and polling. +#. Click *Overview* and click *Check In* to save changes. +#. If updating a VSP, click *Submit*. If this procedure is performed during the workflow to create a VSP, there is no need to click *Submit* now. + +Update a VSP [optional] +----------------------- + +Upload a new Heat package to a VSP. Afterward, update the VF and service. + +**Prerequisites:** Add one or more VSPs (see `Create a Vendor Software Product`_). + +#. From the SDC HOME page, click *ONBOARD* and search for a VSP. +#. In the Overview section, click *Check Out*. +#. In Software Product Attachments (right pane), click *Select file*. +#. Locate a Heat .zip package and click *Open*. + SDC warns that uploading a new package erases existing data. +#. Click *Continue* to upload the new Heat package. + SDC validates the files in the package. After successful validation, SDC displays the files and a success message. If validation fails, SDC displays the errors in the files. + + .. note:: + If the Heat template contains errors, contact the Certification Group for guidance on how to proceed. + +#. Click *Check In* to save changes. +#. Click *Submit* to add the VSP to the catalog. + A success message is displayed. If the VSP attachments contain errors, an error message is displayed instead. Fix the issue(s) and re-submit. +#. After updating the VSP: + #. Upload the VSP to the VF (see steps 3 to 5 in (TBD)Update a VF [optional]). + #. Update the VF version in services that include the VF (see step 4 in (TBD) Update a service [optional]). + + +.. |image0| image:: media/sdro-resource-onboarding-workflow.png + +.. |image1| image:: media/sdro-vsp-service-workflow.png + +.. |image2| image:: media/sdro-sdc_vsp_save.png + +.. |image3| image:: media/sdro-license-creation.png + +.. |image4| image:: media/sdro-license-keygroup.png + +.. |image5| image:: media/sdro-entitlement-pool.png + +.. |image6| image:: media/sdro-feature-group.png + +.. |image7| image:: media/sdro-license-agreement.png + +.. |image8| image:: media/sdro-software-product.png + +.. |image9| image:: media/sdro-design_onboardvsp_heaterrors.png + +.. |image10| image:: media/sdro-edit-nic.png diff --git a/docs/guides/onap-user/resource-onboarding/media/sdro-design_asdccanvas_connect_elements.png b/docs/guides/onap-user/resource-onboarding/media/sdro-design_asdccanvas_connect_elements.png new file mode 100644 index 000000000..27c8986e5 Binary files /dev/null and b/docs/guides/onap-user/resource-onboarding/media/sdro-design_asdccanvas_connect_elements.png differ diff --git a/docs/guides/onap-user/resource-onboarding/media/sdro-design_onboardvsp_heaterrors.png b/docs/guides/onap-user/resource-onboarding/media/sdro-design_onboardvsp_heaterrors.png new file mode 100644 index 000000000..94a6743ed Binary files /dev/null and b/docs/guides/onap-user/resource-onboarding/media/sdro-design_onboardvsp_heaterrors.png differ diff --git a/docs/guides/onap-user/resource-onboarding/media/sdro-edit-nic.png b/docs/guides/onap-user/resource-onboarding/media/sdro-edit-nic.png new file mode 100644 index 000000000..2db64c40b Binary files /dev/null and b/docs/guides/onap-user/resource-onboarding/media/sdro-edit-nic.png differ diff --git a/docs/guides/onap-user/resource-onboarding/media/sdro-entitlement-pool.png b/docs/guides/onap-user/resource-onboarding/media/sdro-entitlement-pool.png new file mode 100644 index 000000000..20fee24c0 Binary files /dev/null and b/docs/guides/onap-user/resource-onboarding/media/sdro-entitlement-pool.png differ diff --git a/docs/guides/onap-user/resource-onboarding/media/sdro-feature-group.png b/docs/guides/onap-user/resource-onboarding/media/sdro-feature-group.png new file mode 100644 index 000000000..9f4f1b408 Binary files /dev/null and b/docs/guides/onap-user/resource-onboarding/media/sdro-feature-group.png differ diff --git a/docs/guides/onap-user/resource-onboarding/media/sdro-license-agreement.png b/docs/guides/onap-user/resource-onboarding/media/sdro-license-agreement.png new file mode 100644 index 000000000..ef99406d9 Binary files /dev/null and b/docs/guides/onap-user/resource-onboarding/media/sdro-license-agreement.png differ diff --git a/docs/guides/onap-user/resource-onboarding/media/sdro-license-creation.png b/docs/guides/onap-user/resource-onboarding/media/sdro-license-creation.png new file mode 100644 index 000000000..a358d03a4 Binary files /dev/null and b/docs/guides/onap-user/resource-onboarding/media/sdro-license-creation.png differ diff --git a/docs/guides/onap-user/resource-onboarding/media/sdro-license-keygroup.png b/docs/guides/onap-user/resource-onboarding/media/sdro-license-keygroup.png new file mode 100644 index 000000000..c8f293401 Binary files /dev/null and b/docs/guides/onap-user/resource-onboarding/media/sdro-license-keygroup.png differ diff --git a/docs/guides/onap-user/resource-onboarding/media/sdro-resource-onboarding-workflow.png b/docs/guides/onap-user/resource-onboarding/media/sdro-resource-onboarding-workflow.png new file mode 100644 index 000000000..dcc3104e4 Binary files /dev/null and b/docs/guides/onap-user/resource-onboarding/media/sdro-resource-onboarding-workflow.png differ diff --git a/docs/guides/onap-user/resource-onboarding/media/sdro-sdc_vsp_save.png b/docs/guides/onap-user/resource-onboarding/media/sdro-sdc_vsp_save.png new file mode 100644 index 000000000..81f1df634 Binary files /dev/null and b/docs/guides/onap-user/resource-onboarding/media/sdro-sdc_vsp_save.png differ diff --git a/docs/guides/onap-user/resource-onboarding/media/sdro-software-product.png b/docs/guides/onap-user/resource-onboarding/media/sdro-software-product.png new file mode 100644 index 000000000..457baa8cf Binary files /dev/null and b/docs/guides/onap-user/resource-onboarding/media/sdro-software-product.png differ diff --git a/docs/guides/onap-user/resource-onboarding/media/sdro-vsp-service-workflow.png b/docs/guides/onap-user/resource-onboarding/media/sdro-vsp-service-workflow.png new file mode 100644 index 000000000..5a5ad9496 Binary files /dev/null and b/docs/guides/onap-user/resource-onboarding/media/sdro-vsp-service-workflow.png differ diff --git a/docs/guides/onap-user/servicedesigner.rst b/docs/guides/onap-user/servicedesigner.rst index 823fccdc1..560cbf490 100644 --- a/docs/guides/onap-user/servicedesigner.rst +++ b/docs/guides/onap-user/servicedesigner.rst @@ -2,6 +2,8 @@ .. International License. http://creativecommons.org/licenses/by/4.0 .. Copyright 2017 AT&T Intellectual Property. All rights reserved. +.. _user-guides-service-design: + Service Design ============== The goal of the service design process is to create all artifacts @@ -22,7 +24,11 @@ Design includes the following topics: * `Pre-Onboarding `_ -* `Resource Onboarding `_ +.. toctree:: + :maxdepth: 1 + :titlesonly: + + Resourse-Onboarding <./resource-onboarding/index.rst> * `VF Creation and Testing `_ diff --git a/docs/release/repolist.rst b/docs/release/repolist.rst index 9871c8ffc..c7e4cd892 100644 --- a/docs/release/repolist.rst +++ b/docs/release/repolist.rst @@ -91,3 +91,4 @@ Project/Components cds <../submodules/ccsdk/cds.git/docs/index> oom/offline-installer <../submodules/oom/offline-installer.git/docs/index> ccsdk/features <../submodules/ccsdk/features.git/docs/index> + parent <../submodules/parent.git/docs/index> diff --git a/docs/submodules/aaf/authz.git b/docs/submodules/aaf/authz.git index 50a914885..096803ce0 160000 --- a/docs/submodules/aaf/authz.git +++ b/docs/submodules/aaf/authz.git @@ -1 +1 @@ -Subproject commit 50a914885f4aa2828e257663d8de0aa64c156cee +Subproject commit 096803ce0a8f4a57cc2f78f7d969cab18cb7a93e diff --git a/docs/submodules/clamp.git b/docs/submodules/clamp.git index f9433d610..7c662851d 160000 --- a/docs/submodules/clamp.git +++ b/docs/submodules/clamp.git @@ -1 +1 @@ -Subproject commit f9433d61033f65e9ed1f685d1e0db99b077bb7e1 +Subproject commit 7c662851d664e394ff197e9968864b53f1853f5b diff --git a/docs/submodules/cli.git b/docs/submodules/cli.git index 513a83a05..26fc3d01a 160000 --- a/docs/submodules/cli.git +++ b/docs/submodules/cli.git @@ -1 +1 @@ -Subproject commit 513a83a0505d9c659e8abedfc1716c3ac8b06f00 +Subproject commit 26fc3d01a9be64e10cbeb814559fd98fefbd7ba7 diff --git a/docs/submodules/dmaap/buscontroller.git b/docs/submodules/dmaap/buscontroller.git index a433b642c..0494603a4 160000 --- a/docs/submodules/dmaap/buscontroller.git +++ b/docs/submodules/dmaap/buscontroller.git @@ -1 +1 @@ -Subproject commit a433b642cff989aabc4c3f918daaa90377a92453 +Subproject commit 0494603a4624d391af8b5a3918555ea7e47ffa10 diff --git a/docs/submodules/externalapi/nbi.git b/docs/submodules/externalapi/nbi.git index ff5433e35..0095af54a 160000 --- a/docs/submodules/externalapi/nbi.git +++ b/docs/submodules/externalapi/nbi.git @@ -1 +1 @@ -Subproject commit ff5433e350678f5f45e8b2aa14cdb00f9cecfceb +Subproject commit 0095af54a51619546e6ab9783adff625b696f4e0 diff --git a/docs/submodules/integration.git b/docs/submodules/integration.git index ca2b87e4a..f20a2a56e 160000 --- a/docs/submodules/integration.git +++ b/docs/submodules/integration.git @@ -1 +1 @@ -Subproject commit ca2b87e4a1e01d1184b0793ea98ddd5385dec6a6 +Subproject commit f20a2a56e8db908749f93a7932aa055dc445e6b3 diff --git a/docs/submodules/multicloud/k8s.git b/docs/submodules/multicloud/k8s.git index 89d99a3ee..63933b0cf 160000 --- a/docs/submodules/multicloud/k8s.git +++ b/docs/submodules/multicloud/k8s.git @@ -1 +1 @@ -Subproject commit 89d99a3ee089eceecd093d30e83aee8afa4466d6 +Subproject commit 63933b0cf304cfdd49fc73278d9c64dcb48f90eb diff --git a/docs/submodules/oom.git b/docs/submodules/oom.git index c0e930f07..960c8f474 160000 --- a/docs/submodules/oom.git +++ b/docs/submodules/oom.git @@ -1 +1 @@ -Subproject commit c0e930f0795c5ea439d48fa6de2acc6b32ffb1d7 +Subproject commit 960c8f474ac54dabc43fb0864240db2de71b08bb diff --git a/docs/submodules/policy/engine.git b/docs/submodules/policy/engine.git index c0358db3a..52ee4af3a 160000 --- a/docs/submodules/policy/engine.git +++ b/docs/submodules/policy/engine.git @@ -1 +1 @@ -Subproject commit c0358db3ac257a91364691654fe82f1b1a4f8bab +Subproject commit 52ee4af3ad37e2e89815ce8c3cc1e9fc1e6db603 diff --git a/docs/submodules/policy/parent.git b/docs/submodules/policy/parent.git new file mode 160000 index 000000000..541f83b8b --- /dev/null +++ b/docs/submodules/policy/parent.git @@ -0,0 +1 @@ +Subproject commit 541f83b8b97f1d3c33401e1cbe9436aa31d7fa76 diff --git a/docs/submodules/portal.git b/docs/submodules/portal.git index c97fca88e..a543a7732 160000 --- a/docs/submodules/portal.git +++ b/docs/submodules/portal.git @@ -1 +1 @@ -Subproject commit c97fca88eab7acc8a6b4bbfc469d7478f03f3112 +Subproject commit a543a773266e13155d739e00c4b9d4b0d1529abf diff --git a/docs/submodules/sdc.git b/docs/submodules/sdc.git index c21ba95e5..9142d9cea 160000 --- a/docs/submodules/sdc.git +++ b/docs/submodules/sdc.git @@ -1 +1 @@ -Subproject commit c21ba95e56f70ba9fbe0daa3ac4b413424b323eb +Subproject commit 9142d9cea9f033c798c7f669df05e0f6f5b63205 diff --git a/docs/submodules/so.git b/docs/submodules/so.git index 458cc8d40..b15889d21 160000 --- a/docs/submodules/so.git +++ b/docs/submodules/so.git @@ -1 +1 @@ -Subproject commit 458cc8d407f27bc360f9d7c93164bae6b764947f +Subproject commit b15889d217c97f80a973e5b594dd198ce011c78c diff --git a/docs/submodules/vfc/nfvo/lcm.git b/docs/submodules/vfc/nfvo/lcm.git index f0ec19865..7da033ea6 160000 --- a/docs/submodules/vfc/nfvo/lcm.git +++ b/docs/submodules/vfc/nfvo/lcm.git @@ -1 +1 @@ -Subproject commit f0ec19865c368c8748737a555ec26966e0bf50c0 +Subproject commit 7da033ea616815244205aa97759ec75bc3326447 diff --git a/docs/submodules/vid.git b/docs/submodules/vid.git index 73e90ce42..f3b31fe84 160000 --- a/docs/submodules/vid.git +++ b/docs/submodules/vid.git @@ -1 +1 @@ -Subproject commit 73e90ce42013fbd2ee87477a2cd8c72eb234df3d +Subproject commit f3b31fe846630953923844ed3ab7defea9ac4447