From 1ac02e74a4a1ed8dcd451fa7a512f085233d40fc Mon Sep 17 00:00:00 2001 From: Chris Donley Date: Thu, 21 Sep 2017 08:59:41 -0700 Subject: documentation update - moved api docs to a subdirectory - cleaned up index Issue-ID: VNFSDK-95 Change-Id: Ic11340589161b8d44dbd95ffde69bf06e96582a3 Signed-off-by: Chris Donley --- docs/files/vnfsdk-apis.rst | 203 +++++++++++++++++++++++++++++++++++++++++++++ docs/index.rst | 37 ++++++--- docs/vnfsdk-apis.rst | 203 --------------------------------------------- 3 files changed, 227 insertions(+), 216 deletions(-) create mode 100644 docs/files/vnfsdk-apis.rst delete mode 100644 docs/vnfsdk-apis.rst (limited to 'docs') diff --git a/docs/files/vnfsdk-apis.rst b/docs/files/vnfsdk-apis.rst new file mode 100644 index 0000000..2531a14 --- /dev/null +++ b/docs/files/vnfsdk-apis.rst @@ -0,0 +1,203 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 + + +VNF SDK APIs +============ + +Market Place API +---------------- +Upload/Re-upload VNF Package +++++++++++++++++++++++++++++ + ++--------------------+-----------------------------+ +|Interface Definition|Description | ++====================+=============================+ +|URI |/onapapi/marketplace/v1/csars| ++--------------------+-----------------------------+ +|Operation Type |POST | ++--------------------+-----------------------------+ +|Content-Type |multipart/form-data | ++--------------------+-----------------------------+ + +Request Parameters: + ++---------+---------+-----------+--------------------------+-----------------------+ +|Attribute|Qualifier|Cardinality|Content |Description | ++=========+=========+===========+==========================+=======================+ +|file |M |1 |InputStream |The CSAR file stream | ++---------+---------+-----------+--------------------------+-----------------------+ +|file |M |1 |FormDataContentDisposition|The detail of CSAR file| ++---------+---------+-----------+--------------------------+-----------------------+ + +FormDataContentDisposition + ++----------------+------------------+-----------------------------------------+ +|Attribute |Content |Description | ++================+==================+=========================================+ +|type |String |the disposition type. will be "form-data"| ++----------------+------------------+-----------------------------------------+ +|name |String |the control name | ++----------------+------------------+-----------------------------------------+ +|fileName |String |the file name | ++----------------+------------------+-----------------------------------------+ +|creationDate |Date |the creation date | ++----------------+------------------+-----------------------------------------+ +|modificationDate|Date |the modification date | ++----------------+------------------+-----------------------------------------+ +|readDate |Date |the read date | ++----------------+------------------+-----------------------------------------+ +|size |String |the size | ++----------------+------------------+-----------------------------------------+ +|parameters |Map|the parameters | ++----------------+------------------+-----------------------------------------+ + +Response: + ++---------+---------+-----------+-------+------------------------------------------------------------------------+ +|Attribute|Qualifier|Cardinality|Content|Description | ++---------+---------+-----------+-------+------------------------------------------------------------------------+ +|csarId |M |1 |String |The CSAR identifier is a unique identifier generated by the Market place| ++---------+---------+-----------+-------+------------------------------------------------------------------------+ + +Delete VNF package by csarId +++++++++++++++++++++++++++++ + ++--------------------+--------------------------------------+ +|Interface Definition|Description | ++====================+======================================+ +|URI |/onapapi/marketplace/v1/csars/{csarId}| ++--------------------+--------------------------------------+ +|Operation Type |DELETE | ++--------------------+--------------------------------------+ + +Request Parameters: + ++---------+---------+-----------+-------+----------------------+ +|Attribute|Qualifier|Cardinality|Content|Description | ++=========+=========+===========+=======+======================+ +|csarId |M |1 |String |The id of CSAR package| ++---------+---------+-----------+-------+----------------------+ + +Response: + +HTTP Success or Error Code + +Download VNF package files  +++++++++++++++++++++++++++ + ++--------------------+--------------------------------------------+ +|Interface Definition|Description | ++====================+============================================+ +|URI |/onapapi/marketplace/v1/csars/{csarId}/files| ++--------------------+--------------------------------------------+ +|Operation Type |GET | ++--------------------+--------------------------------------------+ + +Request Parameters: + ++---------+---------+-----------+-------+--------------+ +|Attribute|Qualifier|Cardinality|Content|Description | ++=========+=========+===========+=======+==============+ +|csarId |M |1 |String |The id of CSAR| ++---------+---------+-----------+-------+--------------+ + +Sample: + +/onapapi/marketplace/v1/csars/78ede6f3-66cc-46ab-b748-38a6c010d272/files? + +Response: + +CSAR Package + +Query VNF package information by csarId ++++++++++++++++++++++++++++++++++++++++ + ++--------------------+--------------------------------------+ +|Interface Definition|Description | ++====================+======================================+ +|URI |/onapapi/marketplace/v1/csars/{csarId}| ++--------------------+--------------------------------------+ +|Operation Type |GET | ++--------------------+--------------------------------------+ + +Request Parameters: + ++---------+---------+-----------+-------+----------------------+ +|Attribute|Qualifier|Cardinality|Content|Description | ++=========+=========+===========+=======+======================+ +|csarId |M |1 |String |The id of CSAR package| ++---------+---------+-----------+-------+----------------------+ + +Response: + +PackageMetaData + ++-------------+---------+-----------+-------+--------------------------------------------------------+ +|Attribute |Qualifier|Cardinality|Content|Description | ++=============+=========+===========+=======+========================================================+ +|csarId |M |1 |String |The id of CSAR package | ++-------------+---------+-----------+-------+--------------------------------------------------------+ +|name |M |1 |String |Name of package | ++-------------+---------+-----------+-------+--------------------------------------------------------+ +|provider |M |1 |String |Provider company name | ++-------------+---------+-----------+-------+--------------------------------------------------------+ +|version |M |1 |String |version of the package | ++-------------+---------+-----------+-------+--------------------------------------------------------+ +|createTime |M |1 |String |create time of package | ++-------------+---------+-----------+-------+--------------------------------------------------------+ +|modifyTime |M |1 |String |modify time of package | ++-------------+---------+-----------+-------+--------------------------------------------------------+ +|downloadUri |M |1 |String |download uri | ++-------------+---------+-----------+-------+--------------------------------------------------------+ +|size |M |1 |String |size of the package | ++-------------+---------+-----------+-------+--------------------------------------------------------+ +|downloadCount|M |1 |Integer|Number of times the package is download from marketplace| ++-------------+---------+-----------+-------+--------------------------------------------------------+ +|shortdesc |M |1 |String |Short description | ++-------------+---------+-----------+-------+--------------------------------------------------------+ +|details |M |1 |String |Detailed description | ++-------------+---------+-----------+-------+--------------------------------------------------------+ + +Sample: +:: + { + "csarId":"78ede6f3-66cc-46ab-b748-38a6c010d272", + "name":"NanocellGateway", + "provider":"XYZ", + "version":"V1.0", + "createTime":"2016-06-29 03:33:15", + "modifyTime":"2016-06-29 09:33:15", + "size":"0.93M", + "downloadUri":"http://msb_ip:msb_port/files/marketplace/CSAR/XYZ/NanocellGW/v1.0/NanocellGateway.csar", + "type":"CSAR" + } + +Query list of VNF package information by conditions ++++++++++++++++++++++++++++++++++++++++++++++++++++ + ++--------------------+-------------------------------------------------------------------------------------------+ +|Interface Definition|Description | ++====================+===========================================================================================+ +|URI |/onapapi/marketplace/v1/csars?name={name}&version={version}&type={type}&provider={provider}| ++--------------------+-------------------------------------------------------------------------------------------+ +|Operation Type |GET | ++--------------------+-------------------------------------------------------------------------------------------+ + +Query Param + ++---------+---------+-----------+-------+-------------+ +|Attribute|Qualifier|Cardinality|Content|Description | ++=========+=========+===========+=======+=============+ +|name |M |1 |String |csar Name | ++---------+---------+-----------+-------+-------------+ +|version |M |1 |String |csar version | ++---------+---------+-----------+-------+-------------+ +|type |M |1 |String |csar type | ++---------+---------+-----------+-------+-------------+ +|provider |M |1 |String |csar provider| ++---------+---------+-----------+-------+-------------+ + +Response: + +List of PackageMetaData diff --git a/docs/index.rst b/docs/index.rst index ec64377..5ad8ac5 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -3,16 +3,20 @@ .. toctree:: :maxdepth: 1 - vnfsdk-apis + files/vnfsdk-apis +VNFSDK +====== -# Documentation Outline +Documentation Outline +--------------------- -API Documentation -# Components +Components +---------- + + VNF Packaging Model/Blueprint + ----------------------------- -VNF Packaging Model/Blueprint ------------------------------ VNF product model/blueprint provides a declarative way to define deployment, operational and functional attributes of a VNF product. The VNF product is defined in terms of deployment time requirements and dependencies and exposed telemetry indicator definitions. The deployment time requirements and dependencies define any and all compute infrastructure needs of the VNF product, such as specific hardware architecture, on-chip features, instruction set availability and hypervisor capabilities. @@ -21,7 +25,9 @@ The telemetry indicator definitions define a set of default indicators exposed b The VNF product model is specified using the TOSCA NFV simple profile. It is persisted, along with the product executables and data, using TOSCA CSAR files. -# VNF SDK Tools + VNF SDK Tools + ------------- + VNF SDK tools provide VNF product DevOps engineers with command line tools and client side API language bindings to define the VNF product model and package content. The following tools are included... • VNF Package Builder - creates a CSAR file based on inputs provided by the VNF product DevOps engineer @@ -34,20 +40,25 @@ VNF SDK tools provide VNF product DevOps engineers with command line tools and c • VNF Package Dry Run - performs a "dry run" install to ensure that the package can be deployed during instantiation -# VNF Validation Tests + VNF Validation Tests + -------------------- TBD -# User Guides - - ## VNF Package Tools User Guide + User Guides + ----------- + + VNF Package Tools User Guide + ---------------------------- VNF Package Designer, provides VNF product DevOps engineers with a graphical tool to define the VNF product model and package content. It is made available as part of the VNF Supplier SDK tools.The package designer makes use of the VNF SDK command line interfaces (CLIs) and client-side API language bindings in order to define the model and the package content. As such, it is functionally equivalent to the VNF SDK tools. - ## Marketplace User Guide for Operators + Marketplace User Guide for Operators + ------------------------------------ TBD - ## Marketplace User Guide for VNF Suppliers + Marketplace User Guide for VNF Suppliers + ---------------------------------------- TBD diff --git a/docs/vnfsdk-apis.rst b/docs/vnfsdk-apis.rst deleted file mode 100644 index 2531a14..0000000 --- a/docs/vnfsdk-apis.rst +++ /dev/null @@ -1,203 +0,0 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. -.. http://creativecommons.org/licenses/by/4.0 - - -VNF SDK APIs -============ - -Market Place API ----------------- -Upload/Re-upload VNF Package -++++++++++++++++++++++++++++ - -+--------------------+-----------------------------+ -|Interface Definition|Description | -+====================+=============================+ -|URI |/onapapi/marketplace/v1/csars| -+--------------------+-----------------------------+ -|Operation Type |POST | -+--------------------+-----------------------------+ -|Content-Type |multipart/form-data | -+--------------------+-----------------------------+ - -Request Parameters: - -+---------+---------+-----------+--------------------------+-----------------------+ -|Attribute|Qualifier|Cardinality|Content |Description | -+=========+=========+===========+==========================+=======================+ -|file |M |1 |InputStream |The CSAR file stream | -+---------+---------+-----------+--------------------------+-----------------------+ -|file |M |1 |FormDataContentDisposition|The detail of CSAR file| -+---------+---------+-----------+--------------------------+-----------------------+ - -FormDataContentDisposition - -+----------------+------------------+-----------------------------------------+ -|Attribute |Content |Description | -+================+==================+=========================================+ -|type |String |the disposition type. will be "form-data"| -+----------------+------------------+-----------------------------------------+ -|name |String |the control name | -+----------------+------------------+-----------------------------------------+ -|fileName |String |the file name | -+----------------+------------------+-----------------------------------------+ -|creationDate |Date |the creation date | -+----------------+------------------+-----------------------------------------+ -|modificationDate|Date |the modification date | -+----------------+------------------+-----------------------------------------+ -|readDate |Date |the read date | -+----------------+------------------+-----------------------------------------+ -|size |String |the size | -+----------------+------------------+-----------------------------------------+ -|parameters |Map|the parameters | -+----------------+------------------+-----------------------------------------+ - -Response: - -+---------+---------+-----------+-------+------------------------------------------------------------------------+ -|Attribute|Qualifier|Cardinality|Content|Description | -+---------+---------+-----------+-------+------------------------------------------------------------------------+ -|csarId |M |1 |String |The CSAR identifier is a unique identifier generated by the Market place| -+---------+---------+-----------+-------+------------------------------------------------------------------------+ - -Delete VNF package by csarId -++++++++++++++++++++++++++++ - -+--------------------+--------------------------------------+ -|Interface Definition|Description | -+====================+======================================+ -|URI |/onapapi/marketplace/v1/csars/{csarId}| -+--------------------+--------------------------------------+ -|Operation Type |DELETE | -+--------------------+--------------------------------------+ - -Request Parameters: - -+---------+---------+-----------+-------+----------------------+ -|Attribute|Qualifier|Cardinality|Content|Description | -+=========+=========+===========+=======+======================+ -|csarId |M |1 |String |The id of CSAR package| -+---------+---------+-----------+-------+----------------------+ - -Response: - -HTTP Success or Error Code - -Download VNF package files  -++++++++++++++++++++++++++ - -+--------------------+--------------------------------------------+ -|Interface Definition|Description | -+====================+============================================+ -|URI |/onapapi/marketplace/v1/csars/{csarId}/files| -+--------------------+--------------------------------------------+ -|Operation Type |GET | -+--------------------+--------------------------------------------+ - -Request Parameters: - -+---------+---------+-----------+-------+--------------+ -|Attribute|Qualifier|Cardinality|Content|Description | -+=========+=========+===========+=======+==============+ -|csarId |M |1 |String |The id of CSAR| -+---------+---------+-----------+-------+--------------+ - -Sample: - -/onapapi/marketplace/v1/csars/78ede6f3-66cc-46ab-b748-38a6c010d272/files? - -Response: - -CSAR Package - -Query VNF package information by csarId -+++++++++++++++++++++++++++++++++++++++ - -+--------------------+--------------------------------------+ -|Interface Definition|Description | -+====================+======================================+ -|URI |/onapapi/marketplace/v1/csars/{csarId}| -+--------------------+--------------------------------------+ -|Operation Type |GET | -+--------------------+--------------------------------------+ - -Request Parameters: - -+---------+---------+-----------+-------+----------------------+ -|Attribute|Qualifier|Cardinality|Content|Description | -+=========+=========+===========+=======+======================+ -|csarId |M |1 |String |The id of CSAR package| -+---------+---------+-----------+-------+----------------------+ - -Response: - -PackageMetaData - -+-------------+---------+-----------+-------+--------------------------------------------------------+ -|Attribute |Qualifier|Cardinality|Content|Description | -+=============+=========+===========+=======+========================================================+ -|csarId |M |1 |String |The id of CSAR package | -+-------------+---------+-----------+-------+--------------------------------------------------------+ -|name |M |1 |String |Name of package | -+-------------+---------+-----------+-------+--------------------------------------------------------+ -|provider |M |1 |String |Provider company name | -+-------------+---------+-----------+-------+--------------------------------------------------------+ -|version |M |1 |String |version of the package | -+-------------+---------+-----------+-------+--------------------------------------------------------+ -|createTime |M |1 |String |create time of package | -+-------------+---------+-----------+-------+--------------------------------------------------------+ -|modifyTime |M |1 |String |modify time of package | -+-------------+---------+-----------+-------+--------------------------------------------------------+ -|downloadUri |M |1 |String |download uri | -+-------------+---------+-----------+-------+--------------------------------------------------------+ -|size |M |1 |String |size of the package | -+-------------+---------+-----------+-------+--------------------------------------------------------+ -|downloadCount|M |1 |Integer|Number of times the package is download from marketplace| -+-------------+---------+-----------+-------+--------------------------------------------------------+ -|shortdesc |M |1 |String |Short description | -+-------------+---------+-----------+-------+--------------------------------------------------------+ -|details |M |1 |String |Detailed description | -+-------------+---------+-----------+-------+--------------------------------------------------------+ - -Sample: -:: - { - "csarId":"78ede6f3-66cc-46ab-b748-38a6c010d272", - "name":"NanocellGateway", - "provider":"XYZ", - "version":"V1.0", - "createTime":"2016-06-29 03:33:15", - "modifyTime":"2016-06-29 09:33:15", - "size":"0.93M", - "downloadUri":"http://msb_ip:msb_port/files/marketplace/CSAR/XYZ/NanocellGW/v1.0/NanocellGateway.csar", - "type":"CSAR" - } - -Query list of VNF package information by conditions -+++++++++++++++++++++++++++++++++++++++++++++++++++ - -+--------------------+-------------------------------------------------------------------------------------------+ -|Interface Definition|Description | -+====================+===========================================================================================+ -|URI |/onapapi/marketplace/v1/csars?name={name}&version={version}&type={type}&provider={provider}| -+--------------------+-------------------------------------------------------------------------------------------+ -|Operation Type |GET | -+--------------------+-------------------------------------------------------------------------------------------+ - -Query Param - -+---------+---------+-----------+-------+-------------+ -|Attribute|Qualifier|Cardinality|Content|Description | -+=========+=========+===========+=======+=============+ -|name |M |1 |String |csar Name | -+---------+---------+-----------+-------+-------------+ -|version |M |1 |String |csar version | -+---------+---------+-----------+-------+-------------+ -|type |M |1 |String |csar type | -+---------+---------+-----------+-------+-------------+ -|provider |M |1 |String |csar provider| -+---------+---------+-----------+-------+-------------+ - -Response: - -List of PackageMetaData -- cgit 1.2.3-korg