From e243c1f9c40c5acee4fb89d99fae05f7a46768be Mon Sep 17 00:00:00 2001 From: zhipengh Date: Mon, 27 Feb 2017 04:26:21 -0500 Subject: Release D doc update Change-Id: I6b2749e5692cf6af2615ff5aff81ff060a1a25d3 Signed-off-by: zhipengh --- docs/userguide/featureusage.rst | 184 ---------------------------------------- docs/userguide/index.rst | 26 ------ docs/userguide/policy2tosca.rst | 52 ------------ docs/userguide/testusage.rst | 54 ------------ docs/userguide/yang2tosca.rst | 49 ----------- 5 files changed, 365 deletions(-) delete mode 100644 docs/userguide/featureusage.rst delete mode 100644 docs/userguide/index.rst delete mode 100644 docs/userguide/policy2tosca.rst delete mode 100644 docs/userguide/testusage.rst delete mode 100644 docs/userguide/yang2tosca.rst (limited to 'docs/userguide') diff --git a/docs/userguide/featureusage.rst b/docs/userguide/featureusage.rst deleted file mode 100644 index c42330c..0000000 --- a/docs/userguide/featureusage.rst +++ /dev/null @@ -1,184 +0,0 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. -.. http://creativecommons.org/licenses/by/4.0 -.. (c) - -Parser tosca2heat Installation -============================ - -Please follow the below installation steps to install tosca2heat submodule in parser. - -Step 1: Clone the parser project. - -.. code-block:: bash - - git clone https://gerrit.opnfv.org/gerrit/parser - -Step 2: Install the heat-translator sub project. - -.. code-block:: bash - - # uninstall pre-installed tosca-parser - pip uninstall -y heat-translator - - # change directory to heat-translator - cd parser/tosca2heat/heat-translator - - # install requirements - pip install -r requirements.txt - - # install heat-translator - python setup.py install - -Step 3: Install the tosca-parser sub project. - -.. code-block:: bash - - # uninstall pre-installed tosca-parser - pip uninstall -y tosca-parser - - # change directory to tosca-parser - cd parser/tosca2heat/tosca-parser - - # install requirements - pip install -r requirements.txt - - # install tosca-parser - python setup.py install - - - **Notes** It must uninstall pre-installed tosca-parser and heat-translator before install the two - components, and install heat-translator before installing tosca-parser, which is sure to use the - OPNFV version of tosca-parser and heat-translator other than openstack's components. - -Parser tosca2heat Execution -=========================== - -Step 1: Change directory to where the tosca yaml files are present, example is -below with vRNC definiton. - -.. code-block:: bash - - cd parser/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions - - -Step 2: Run the python command heat-translator with the TOSCA yaml file as an input option. - -.. code-block:: bash - - heat-translator --template-file= --template-type=tosca - --outpurt-file= - -Example: - -.. code-block:: bash - - heat-translator --template-file=vRNC.yaml \ - --template-type=tosca --output-file=vRNC_hot.yaml - -Notes: heat-translator will call class of ToscaTemplate in tosca-parser firstly to validate and -parse input yaml file, then tranlate the file into hot file, if you only want to validate or -check the input file and don't want to translate, please use tosaca-parser as following: - -.. code-block:: bash - - tosca-parser --template-file= - -Example: - -.. code-block:: bash - - tosca-parser --template-file=vRNC.yaml - -Parser tosca2heat References -=========================== -Refer two upstream components: - https://github.com/openstack/tosca-parser/blob/master/doc/source/usage.rst - https://github.com/openstack/heat-translator/blob/master/doc/source/usage.rst - - - - -Parser yang2tosca Execution -============================ - -Step 1: Change directory to where the scripts are present. - -.. code-block:: bash - - cd parser/yang2tosca - -Step 2: Copy the YANG file which needs to be converted into TOSCA to - current (parser/yang2tosca) folder. - -Step 3: Run the python script "parser.py" with the YANG file as an input option. - -.. code-block:: bash - - python parser.py -n "YANG filename" - -Example: - -.. code-block:: bash - - python parser.py -n example.yaml - -Step 4: Verify the TOSCA YAMl which file has been created with the same name - as the YANG file with a “_tosca” suffix. - -.. code-block:: bash - - cat "YANG filename_tosca.yaml" - -Example: - -.. code-block:: bash - - cat example_tosca.yaml - - - - - -Parser policy2tosca Execution -============================ - -Step 1: To see a list of commands available. - -.. code-block:: bash - - policy2tosca --help - -Step 2: To see help for an individual command, include the command name on the command line - -.. code-block:: bash - - policy2tosca help - -Step 3: To inject/remove policy types/policy definitions provide the TOSCA file as input to -policy2tosca command line. - -.. code-block:: bash - - policy2tosca [arguments] - -Example: - -.. code-block:: bash - - policy2tosca add-definition --policy_name rule2 --policy_type tosca.policies.Placement.Geolocation ---description "test description" --properties region:us-north-1,region:us-north-2,min_inst:2 --targets -VNF2,VNF4 --metadata "map of strings" --triggers "1,2,3,4" --source example.yaml - - -Step 4: Verify the TOSCA YAMl updated with the injection/removal executed. - -.. code-block:: bash - - cat "" - -Example: - -.. code-block:: bash - - cat example_tosca.yaml - diff --git a/docs/userguide/index.rst b/docs/userguide/index.rst deleted file mode 100644 index 938f9c6..0000000 --- a/docs/userguide/index.rst +++ /dev/null @@ -1,26 +0,0 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International -.. License. -.. http://creativecommons.org/licenses/by/4.0 -.. (c) OPNFV, Ericsson AB and others. - -================= -Parser User Guide -================= -Parser is an open source project and licensed under Apache 2. Parser will help -to provide a tooling mechanism, by parsing and then further translating Telecom -operators deployment descriptors into certain common templates, which could be -used in IaaS orchestration projects like OpenStack Heat(the template file is HOT, -which stands for Heat Orchestrator Template). - -This document contains installation guide , execution guide as well as testing guide -for Parser's three submodules: tosca2heat, yang2tosca and policy2tosca. - - -Contents: - -.. toctree:: - :numbered: - :maxdepth: 2 - -.. include:: featureusage.rst -.. include:: testusage.rst diff --git a/docs/userguide/policy2tosca.rst b/docs/userguide/policy2tosca.rst deleted file mode 100644 index 3f4f2e7..0000000 --- a/docs/userguide/policy2tosca.rst +++ /dev/null @@ -1,52 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -Execution -=========================== - -Step 1: To see a list of commands available. - -.. code-block:: bash - - policy2tosca --help - -Step 2: To see help for an individual command, include the command name on the command line - -.. code-block:: bash - - policy2tosca help - -Step 3: To inject/remove policy types/policy definitions provide the TOSCA file as input to policy2tosca command line. - -.. code-block:: bash - - policy2tosca [arguments] - -Example: - -.. code-block:: bash - - policy2tosca add-definition --policy_name rule2 --policy_type tosca.policies.Placement.Geolocation --description "test description" --properties region:us-north-1,region:us-north-2,min_inst:2 --targets VNF2,VNF4 --metadata "map of strings" --triggers "1,2,3,4" --source example.yaml - - -Step 4: Verify the TOSCA YAMl updated with the injection/removal executed. - -.. code-block:: bash - - cat "" - -Example: - -.. code-block:: bash - - cat example_tosca.yaml diff --git a/docs/userguide/testusage.rst b/docs/userguide/testusage.rst deleted file mode 100644 index 47f37f1..0000000 --- a/docs/userguide/testusage.rst +++ /dev/null @@ -1,54 +0,0 @@ -.. This work is licensed under a Creative Commons Attribution 4.0 International License. -.. http://creativecommons.org/licenses/by/4.0 -.. (c) - -Parser tosca2heat test usage -=========================== -1. run tox in tosca-parser sub project - -.. code-block:: bash - - # change directory to tosca-parser - cd parser/tosca2heat/tosca-parser - - # run with pep8 - tox -epep8 - - # run unit test - tox -epy27 - -or - -.. code-block:: bash - - # change directory to tosca-parser - cd parser/tosca2heat/tosca-parser - - # run tox - tox - - -2. run tox in heat-translator sub project - -.. code-block:: bash - - # change directory to heat-translator - cd parser/tosca2heat/heat-translator - - # run with pep8 - tox -epep8 - - # run unit test - tox -epy27 - tox -epy34 - -or - -.. code-block:: bash - - # change directory to heat-translator - cd parser/tosca2heat/heat-translator - - # run tox - tox - diff --git a/docs/userguide/yang2tosca.rst b/docs/userguide/yang2tosca.rst deleted file mode 100644 index 4708c9a..0000000 --- a/docs/userguide/yang2tosca.rst +++ /dev/null @@ -1,49 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -Execution -=========================== - -Step 1: Change directory to where the scripts are present. - -.. code-block:: bash - - cd parser/yang2tosca - -Step 2: Copy the YANG file which needs to be converted into TOSCA to - current (parser/yang2tosca) folder. - -Step 3: Run the python script "parser.py" with the YANG file as an input option. - -.. code-block:: bash - - python parser.py -n "YANG filename" - -Example: - -.. code-block:: bash - - python parser.py -n example.yaml - -Step 4: Verify the TOSCA YAMl which file has been created with the same name - as the YANG file with a “_tosca” suffix. - -.. code-block:: bash - - cat "YANG filename_tosca.yaml" - -Example: - -.. code-block:: bash - - cat example_tosca.yaml -- cgit 1.2.3-korg