OpenDev Migration Patch

This commit was bulk generated and pushed by the OpenDev sysadmins
as a part of the Git hosting and code review systems migration
detailed in these mailing list posts:

http://lists.openstack.org/pipermail/openstack-discuss/2019-March/003603.html
http://lists.openstack.org/pipermail/openstack-discuss/2019-April/004920.html

Attempts have been made to correct repository namespaces and
hostnames based on simple pattern matching, but it's possible some
were updated incorrectly or missed entirely. Please reach out to us
via the contact information listed at https://opendev.org/ with any
questions you may have.

.gitignore

@@ -20,7 +20,6 @@ run_tests.log
 .idea/
 .tox/
 .venv/
-.stestr/
 
 # Files created by releasenotes build
 releasenotes/build

.gitreview

@@ -2,3 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/python-tackerclient.git
+defaultbranch=stable/ocata

.stestr.conf

@@ -1,3 +0,0 @@
-[DEFAULT]
-test_path=./tackerclient/tests/unit
-top_path=./

.testr.conf

@@ -0,0 +1,4 @@
+[DEFAULT]
+test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./tackerclient/tests/unit/vm} $LISTOPT $IDOPTION
+test_id_option=--load-list $IDFILE
+test_list_option=--list

.zuul.yaml

@@ -1,7 +1,7 @@
 - project:
     templates:
+      - openstack-python-jobs
+      - openstack-python35-jobs-nonvoting
       - check-requirements
-      - openstack-lower-constraints-jobs
-      - openstack-python3-victoria-jobs
-      - publish-openstack-docs-pti
-      - release-notes-jobs-python3
+      - publish-openstack-sphinx-docs
+      - release-notes-jobs

CONTRIBUTING.rst

@@ -1,16 +0,0 @@
-If you would like to contribute to the development of OpenStack,
-you must follow the steps in this page:
-
-   https://docs.openstack.org/infra/manual/developers.html
-
-Once those steps have been completed, changes to OpenStack
-should be submitted for review via the Gerrit tool, following
-the workflow documented at:
-
-   https://docs.openstack.org/infra/manual/developers.html#development-workflow
-
-Pull requests submitted through GitHub will be ignored.
-
-Bugs should be filed on Launchpad, not GitHub:
-
-   https://bugs.launchpad.net/python-tackerclient

HACKING.rst

@@ -1,26 +1,26 @@
 Tacker Style Commandments
-=========================
+================================
 
 - Step 1: Read the OpenStack Style Commandments
-  https://docs.openstack.org/hacking/latest
+  http://docs.openstack.org/developer/hacking/
 - Step 2: Read on
 
 
 Running Tests
 -------------
-The testing system is based on a combination of tox and stestr. The canonical
-approach to running tests is to simply run the command ``tox``. This will
-create virtual environments, populate them with dependencies and run all of
+The testing system is based on a combination of tox and testr. The canonical
+approach to running tests is to simply run the command `tox`. This will
+create virtual environments, populate them with depenedencies and run all of
 the tests that OpenStack CI systems run. Behind the scenes, tox is running
-``stestr run``, but is set up such that you can supply any additional
-stestr arguments that are needed to tox. For example, you can run:
-``tox -- --analyze-isolation`` to cause tox to tell stestr to add
+`testr run --parallel`, but is set up such that you can supply any additional
+testr arguments that are needed to tox. For example, you can run:
+`tox -- --analyze-isolation` to cause tox to tell testr to add
 --analyze-isolation to its argument list.
 
 It is also possible to run the tests inside of a virtual environment
 you have created, or it is possible that you have all of the dependencies
-installed locally already. In this case, you can interact with the stestr
-command directly. Running ``stestr run`` will run the entire test suite.
-``stestr run --concurrency=1`` will run tests serially (by default, stestr runs
-tests in parallel). More information about stestr can be found at:
-http://stestr.readthedocs.io/
+installed locally already. In this case, you can interact with the testr
+command directly. Running `testr run` will run the entire test suite. `testr
+run --parallel` will run it in parallel (this is the default incantation tox
+uses.) More information about testr can be found at:
+http://wiki.openstack.org/testr

README.rst

@@ -2,68 +2,9 @@
 Team and repository tags
 ========================
 
-.. image:: https://governance.openstack.org/tc/badges/python-tackerclient.svg
-    :target: https://governance.openstack.org/tc/reference/tags/index.html
+.. image:: http://governance.openstack.org/badges/python-tackerclient.svg
+    :target: http://governance.openstack.org/reference/tags/index.html
 
 .. Change things from this point on
 
-NFV Orchestration (Tacker) Client
-=================================
-
-CLI and Client Library for OpenStack Tacker
-
-Installation
-============
-
-**Note:** The paths we are using for configuration files in these steps
-are with reference to Ubuntu Operating System. The paths may vary for
-other Operating Systems.
-
-The branch_name which is used in commands, specify the branch_name
-as stable/<branch> for any stable branch installation. For eg:
-stable/queens, stable/pike. If unspecified the default will be
-master branch.
-
-Using python install
---------------------
-Clone python-tackerclient repository.
-
-  ::
-
-    $ cd ~/
-    $ git clone https://github.com/openstack/python-tackerclient -b <branch_name>
-
-
-Install python-tackerclient.
-
-  ::
-
-    $ cd python-tackerclient
-    $ sudo python setup.py install
-
-
-Using pip
----------
-
-You can also install the latest version by using ``pip`` command:
-
-  ::
-
-    $ pip install python-tackerclient
-
-
-Or, if it is needed to install ``python-tackerclient`` from master branch,
-type
-
-  ::
-
-    $ pip install git+https://github.com/openstack/python-tackerclient.git
-
-
-More Information
-================
-
-* Python-tackerclient documentation: https://docs.openstack.org/python-tackerclient/latest/
-* Tacker Documentation: https://docs.openstack.org/tacker/latest/
-* Tacker Wiki: https://wiki.openstack.org/wiki/Tacker
-* Release Notes: https://docs.openstack.org/releasenotes/python-tackerclient
+This is the client API library for Tacker.

doc/requirements.txt

@@ -1,7 +0,0 @@
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
-# These are needed for docs generation
-sphinx>=2.0.0,!=2.1.0 # BSD
-openstackdocstheme>=2.2.1 # Apache-2.0
-reno>=3.1.0 # Apache-2.0

doc/source/cli/commands.rst

@@ -1,85 +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.
-
-      Convention for heading levels in Neutron devref:
-      =======  Heading 0 (reserved for the title in a document)
-      -------  Heading 1
-      ~~~~~~~  Heading 2
-      +++++++  Heading 3
-      '''''''  Heading 4
-      (Avoid deeper levels because they do not render well.)
-
-=============
-Command List
-=============
-
-The following list covers the extended commands for Tacker services
-available in **openstack** command.
-
-These commands can be referenced by doing **openstack help** and the detail
-of individual command can be referred by **openstack help <command-name>**.
-
-.. code-block:: console
-
-   openstack vnf create                            Create a VNF.
-   openstack vnf delete                            Delete given VNF(s).
-   openstack vnf list                              List VNF(s) that belong to a given tenant.
-   openstack vnf resource list                     List resources of a VNF like VDU, CP, etc.
-   openstack vnf scale                             Scale a VNF.
-   openstack vnf show                              Show information of a given VNF.
-   openstack vnf set                               Update a given VNF.
-   openstack vnf descriptor create                 Create a VNFD.
-   openstack vnf descriptor delete                 Delete given VNFD(s).
-   openstack vnf descriptor list                   List VNFD(s) that belong to a given tenant.
-   openstack vnf descriptor show                   Show information of a given VNFD.
-   openstack vnf descriptor template show          Show template of a given VNFD.
-   openstack vim list                              List VIM(s) that belong to a given tenant.
-   openstack vim register                          Create a VIM.
-   openstack vim show                              Show information of a given VIM.
-   openstack vim set                               Update a given VIM.
-   openstack vim delete                            Delete given VIM(s).
-   openstack ns create                             Create a NS.
-   openstack ns delete                             Delete given NS(s).
-   openstack ns list                               List NS that belong to a given tenant.
-   openstack ns show                               Show information of a given NS.
-   openstack ns descriptor create                  Create a NSD.
-   openstack ns descriptor delete                  Delete a given NSD.
-   openstack ns descriptor list                    List NSD(s) that belong to a given tenant.
-   openstack ns descriptor show                    Show information of a given NSD.
-   openstack ns descriptor template show           Show template of a given NSD.
-   openstack vnf graph create                      Create a VNFFG.
-   openstack vnf graph delete                      Delete a given VNFFG.
-   openstack vnf graph list                        List VNFFG(s) that belong to a given tenant.
-   openstack vnf graph show                        Show information of a given VNFFG.
-   openstack vnf graph set                         Update a given VNFFG.
-   openstack vnf graph descriptor create           Create a VNFFGD.
-   openstack vnf graph descriptor delete           Delete a given VNFFGD.
-   openstack vnf graph descriptor list             List VNFFGD(s) that belong to a given tenant.
-   openstack vnf graph descriptor show             Show information of a given VNFFGD.
-   openstack vnf graph descriptor template show    Show template of a given VNFFGD.
-   openstack vnf chain list                        List SFC(s) that belong to a given tenant.
-   openstack vnf chain show                        Show information of a given SFC.
-   openstack vnf classifier list                   List FC(s) that belong to a given tenant.
-   openstack vnf classifier show                   Show information of a given FC.
-   openstack vnf network forwarding path list      List NFP(s) that belong to a given tenant.
-   openstack vnf network forwarding path show      Show information of a given NFP.
-   openstack nfv event show                        Show event given the event id.
-   openstack nfv event list                        List events of resources.
-   openstack vnf package create                    Create a new individual VNF package resource.
-   openstack vnf package list                      List all VNF packages.
-   openstack vnf package show                      Show package details.
-   openstack vnf package upload                    Upload a VNF package by providing the address information
-                                                   of the VNF package.
-   openstack vnf package delete                    Delete given VNF package(s).
-
-

doc/source/cli/index.rst

@@ -1,9 +0,0 @@
-============
-CLI Usage
-============
-
-.. toctree::
-   :glob:
-   :maxdepth: 3
-
-   *

doc/source/cli/vnf_package_commands.rst

@@ -1,9 +0,0 @@
-====================
-VNF Package commands
-====================
-
-VNF Package commands are CLI interface of VNF Package Management Interface in
-`ETSI NFV-SOL 005 <https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/005/02.06.01_60/gs_NFV-SOL005v020601p.pdf>`_.
-
-.. autoprogram-cliff:: openstack.tackerclient.v1
-   :command: vnf package *

doc/source/conf.py

@@ -1,38 +1,13 @@
 # -*- coding: utf-8 -*-
-# 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.
 
-# python-tackerclient documentation build configuration file
+project = 'python-tackerclient'
 
-import os
-import sys
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#    sys.path.append(os.path.abspath('.'))
-
-sys.path.insert(0, os.path.abspath('../..'))
-
-# -- General configuration ----------------------------------------------------
+# -- General configuration ---------------------------------------------
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = [
-    'sphinx.ext.autodoc',
-    'reno.sphinxext',
-    'openstackdocstheme',
-    'cliff.sphinxext',
-]
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -44,7 +19,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-copyright = 'OpenStack Contributors'
+copyright = u'OpenStack Foundation'
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
 add_function_parentheses = True
@@ -54,33 +29,27 @@ add_function_parentheses = True
 add_module_names = True
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'native'
+pygments_style = 'sphinx'
 
-# -- Options for HTML output --------------------------------------------------
+# -- Options for HTML output ---------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme = 'openstackdocs'
+html_theme = 'nature'
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'tackerclientdoc'
+htmlhelp_basename = '%sdoc' % project
 
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
 
-# -- Options for manual page output -------------------------------------------
-
-man_pages = [
-    ('cli/index', 'tacker', u'Client for Tacker API',
-     [u'OpenStack Contributors'], 1),
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author,
+#  documentclass [howto/manual]).
+latex_documents = [
+  ('index',
+    '%s.tex' % project,
+    u'%s Documentation' % project,
+    u'OpenStack Foundation', 'manual'),
 ]
 
-# -- Options for openstackdocstheme -------------------------------------------
-
-openstackdocs_repo_name = 'openstack/python-tackerclient'
-openstackdocs_bug_project = 'python-tackerclient'
-openstackdocs_bug_tag = 'doc'
-
-# -- Options for cliff.sphinxext plugin ---------------------------------------
-
-autoprogram_cliff_application = 'openstack'
+# Example configuration for intersphinx: refer to the Python standard library.
+intersphinx_mapping = {'http://docs.python.org/': None}

doc/source/contributor/contributing.rst

@@ -1,26 +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.
-
-      Convention for heading levels in Neutron devref:
-      =======  Heading 0 (reserved for the title in a document)
-      -------  Heading 1
-      ~~~~~~~  Heading 2
-      +++++++  Heading 3
-      '''''''  Heading 4
-      (Avoid deeper levels because they do not render well.)
-
-============
-Contributing
-============
-
-.. include:: ../../../CONTRIBUTING.rst

doc/source/contributor/developing.rst

@@ -1,195 +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.
-
-      Convention for heading levels in Neutron devref:
-      =======  Heading 0 (reserved for the title in a document)
-      -------  Heading 1
-      ~~~~~~~  Heading 2
-      +++++++  Heading 3
-      '''''''  Heading 4
-      (Avoid deeper levels because they do not render well.)
-
-===================================
-Developing with Python-TackerClient
-===================================
-
-Project Info
-============
-
-* **Free software:** under the `Apache license <http://www.apache.org/licenses/LICENSE-2.0>`_
-* **Tacker Service:** https://opendev.org/openstack/tacker
-* **Tacker Client Library:** https://opendev.org/openstack/python-tackerclient
-* **Tacker Service Bugs:** https://bugs.launchpad.net/tacker
-* **Client Bugs:** https://bugs.launchpad.net/python-tackerclient
-* **Blueprints:** https://blueprints.launchpad.net/tacker
-
-Meetings
-========
-For details please refer to the `OpenStack IRC meetings`_ page.
-
-.. _`OpenStack IRC meetings`: http://eavesdrop.openstack.org/#Tacker_(NFV_Orchestrator_and_VNF_Manager)_Team_Meeting
-
-Testing
-=======
-
-Install the prerequisites for Tox:
-
-* On Ubuntu or Debian:
-
-  .. code-block:: bash
-
-    $ apt-get install gcc gettext python-dev libxml2-dev libxslt1-dev \
-      zlib1g-dev
-
-  You may need to use pip install for some packages.
-
-
-* On RHEL or CentOS including Fedora:
-
-  .. code-block:: bash
-
-    $ yum install gcc python-devel libxml2-devel libxslt-devel
-
-* On openSUSE or SUSE linux Enterprise:
-
-  .. code-block:: bash
-
-    $ zypper install gcc python-devel libxml2-devel libxslt-devel
-
-Install python-tox:
-
-.. code-block:: bash
-
-    $ pip install tox
-
-To run the full suite of tests maintained within TackerClient.
-
-.. code-block:: bash
-
-    $ tox
-
-.. NOTE::
-
-    The first time you run ``tox``, it will take additional time to build
-    virtualenvs. You can later use the ``-r`` option with ``tox`` to rebuild
-    your virtualenv in a similar manner.
-
-
-To run tests for one or more specific test environments(for example, the
-most common configuration of Python 2.7, Python 3.5 and PEP-8), list the
-environments with the ``-e`` option, separated by spaces:
-
-.. code-block:: bash
-
-    $ tox -e py27,py35,pep8
-
-See ``tox.ini`` for the full list of available test environments.
-
-Building the Documentation
-==========================
-
-The documentation is generated with Sphinx using the ``tox`` command. To
-create HTML docs, run the commands:
-
-.. code-block:: bash
-
-    $ tox -e docs
-
-The resultant HTML will be in the ``doc/build/html`` directory.
-
-Release Notes
-=============
-
-The release notes for a patch should be included in the patch.  See the
-`Project Team Guide`_ for more information on using reno in OpenStack.
-
-.. _`Project Team Guide`: http://docs.openstack.org/project-team-guide/release-management.html#managing-release-notes
-
-If any of the following applies to the patch, a release note is required:
-
-* The deployer needs to take an action when upgrading
-* The plugin interface changes
-* A new feature is implemented
-* A command or option is removed
-* Current behavior is changed
-* A security bug is fixed
-
-Reno is used to generate release notes. Use the commands:
-
-.. code-block:: bash
-
-    $ tox -e venv -- reno new <bug-,bp-,whatever>
-
-Then edit the sample file that was created and push it with your change.
-
-To run the commands and see results:
-
-.. code-block:: bash
-
-    $ git commit  # Commit the change because reno scans git log.
-
-    $ tox -e releasenotes
-
-At last, look at the generated release notes
-files in ``releasenotes/build/html`` in your browser.
-
-Testing new code
-================
-
-If a developer wants to test new code (feature, command or option) that
-they have written, Python-TackerClient may be installed from source by running
-the following commands in the base directory of the project:
-
-.. code-block:: bash
-
-   $ python setup.py install
-
-or
-
-.. code-block:: bash
-
-   $ pip install -e .
-
-Standardize Import Format
-=========================
-
-.. _`Import Order Guide`: https://docs.openstack.org/hacking/latest/user/hacking.html#imports
-
-The import order shows below:
-
-* {{stdlib imports in human alphabetical order}}
-* \n
-* {{third-party lib imports in human alphabetical order}}
-* \n
-* {{project imports in human alphabetical order}}
-* \n
-* \n
-* {{begin your code}}
-
-Example
-~~~~~~~
-
-.. code-block:: python
-
-    import copy
-    import fixtures
-    import mock
-    import os
-
-    from osc_lib.api import auth
-    from osc_lib import utils
-    import six
-
-    from openstackclient import shell
-    from openstackclient.tests import utils
-

doc/source/contributor/index.rst

@@ -1,36 +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.
-
-      Convention for heading levels in Neutron devref:
-      =======  Heading 0 (reserved for the title in a document)
-      -------  Heading 1
-      ~~~~~~~  Heading 2
-      +++++++  Heading 3
-      '''''''  Heading 4
-      (Avoid deeper levels because they do not render well.)
-
-=================
-Contributor Guide
-=================
-
-In the Contributor Guide, you will find information on tackerclient's
-lower level programming details or APIs as well as the transition to
-OpenStack client.
-
-.. toctree::
-   :maxdepth: 2
-
-   contributing.rst
-   developing.rst
-
-

doc/source/index.rst

@@ -1,56 +1,25 @@
-..
-      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
+Python bindings to the OpenStack Tacker API
+============================================
 
-          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.
-
-      Convention for heading levels in Neutron devref:
-      =======  Heading 0 (reserved for the title in a document)
-      -------  Heading 1
-      ~~~~~~~  Heading 2
-      +++++++  Heading 3
-      '''''''  Heading 4
-      (Avoid deeper levels because they do not render well.)
-
-=================================
-Python-TackerClient Documentation
-=================================
-
-This is a client for OpenStack NFV MANO (Tacker) API. It provides
-:doc:`Python API bindings <reference/index>` (the tackerclient module) and
-:doc:`command-line interface (CLI) <cli/index>`.
-
-Contents
---------
-
-.. toctree::
-   :maxdepth: 2
-
-   install/index
-   cli/index
-   contributor/index
-   reference/index
+In order to use the python tacker client directly, you must first obtain an auth token and identify which endpoint you wish to speak to. Once you have done so, you can use the API.
 
 
-Release Notes
--------------
+Command-line Tool
+=================
+In order to use the CLI, you must provide your OpenStack username, password, tenant, and auth endpoint. Use the corresponding configuration options (``--os-username``, ``--os-password``, ``--os-tenant-name``, and ``--os-auth-url``) or set them in environment variables::
 
-.. toctree::
-   :maxdepth: 1
+    export OS_USERNAME=user
+    export OS_PASSWORD=pass
+    export OS_TENANT_NAME=tenant
+    export OS_AUTH_URL=http://auth.example.com:5000/v2.0
 
-   Release Notes <https://docs.openstack.org/releasenotes/python-tackerclient/>
+The command line tool will attempt to reauthenticate using your provided credentials for every request. You can override this behavior by manually supplying an auth token using ``--os-url`` and ``--os-auth-token``. You can alternatively set these environment variables::
 
+    export OS_URL=http://tacker.example.org:9890/
+    export OS_TOKEN=3bcc3d3a03f44e3d8377f9247b0ad155
 
-Indices and Tables
-------------------
+If tacker server does not require authentication, besides these two arguments or environment variables (We can use any value as token.), we need manually supply ``--os-auth-strategy`` or set the environment variable::
 
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
+    export OS_AUTH_STRATEGY=noauth
+
+Once you've configured your authentication parameters, you can run ``tacker -h`` to see a complete listing of available commands.

doc/source/install/index.rst

@@ -1,69 +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.
-
-      Convention for heading levels in Neutron devref:
-      =======  Heading 0 (reserved for the title in a document)
-      -------  Heading 1
-      ~~~~~~~  Heading 2
-      +++++++  Heading 3
-      '''''''  Heading 4
-      (Avoid deeper levels because they do not render well.)
-
-============
-Installation
-============
-
-**Note:** The paths we are using for configuration files in these steps
-are with reference to Ubuntu Operating System. The paths may vary for
-other Operating Systems.
-
-The branch_name which is used in commands, specify the branch_name
-as stable/<branch> for any stable branch installation. For eg:
-stable/queens, stable/pike. If unspecified the default will be
-master branch.
-
-Using python install
-====================
-1. Clone python-tackerclient repository.
-
-  ::
-
-    $ cd ~/
-    $ git clone https://github.com/openstack/python-tackerclient -b <branch_name>
-
-
-2. Install python-tackerclient.
-
-  ::
-
-    $ cd python-tackerclient
-    $ sudo python setup.py install
-
-
-Using pip
-=========
-
-You can also install the latest version by using ``pip`` command:
-
-  ::
-
-    $ pip install python-tackerclient
-
-
-Or, if it is needed to install ``python-tackerclient`` from master branch,
-type
-
-  ::
-
-    $ pip install git+https://github.com/openstack/python-tackerclient.git
-

doc/source/reference/index.rst

@@ -1,26 +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.
-
-      Convention for heading levels in Neutron devref:
-      =======  Heading 0 (reserved for the title in a document)
-      -------  Heading 1
-      ~~~~~~~  Heading 2
-      +++++++  Heading 3
-      '''''''  Heading 4
-      (Avoid deeper levels because they do not render well.)
-
-=========
-Reference
-=========
-
-(To be updated)

lower-constraints.txt

@@ -1,62 +0,0 @@
-appdirs==1.3.0
-Babel==2.3.4
-cliff==2.8.0
-cmd2==0.8.0
-coverage==4.0
-ddt==1.0.1
-debtcollector==1.2.0
-decorator==3.4.0
-deprecation==1.0
-dogpile.cache==0.6.2
-extras==1.0.0
-fixtures==3.0.0
-flake8==2.5.5
-hacking==0.12.0
-iso8601==0.1.11
-jmespath==0.9.0
-jsonpatch==1.16
-jsonpointer==1.13
-keystoneauth1==3.4.0
-linecache2==1.0.0
-mccabe==0.2.1
-monotonic==0.6
-msgpack-python==0.4.0
-munch==2.1.0
-netaddr==0.7.18
-netifaces==0.10.4
-openstacksdk==0.11.2
-os-client-config==1.28.0
-os-service-types==1.2.0
-osc-lib==1.8.0
-oslo.config==5.2.0
-oslo.context==2.19.2
-oslo.i18n==3.15.3
-oslo.log==3.36.0
-oslo.serialization==2.18.0
-oslo.utils==3.40.0
-pbr==2.0.0
-pep8==1.5.7
-positional==1.2.1
-prettytable==0.7.2
-pyflakes==0.8.1
-pyinotify==0.9.6
-pyparsing==2.1.0
-pyperclip==1.5.27
-python-dateutil==2.5.3
-python-keystoneclient==3.8.0
-python-mimeparse==1.6.0
-python-subunit==1.0.0
-pytz==2013.6
-PyYAML==3.12
-requests==2.14.2
-requests-mock==1.2.0
-requestsexceptions==1.2.0
-rfc3986==0.3.1
-simplejson==3.5.1
-six==1.10.0
-stestr==2.0.0
-stevedore==1.20.0
-testtools==2.2.0
-traceback2==1.4.0
-unittest2==1.1.0
-wrapt==1.7.0

releasenotes/notes/add-creating-ns-vnffg-from-template-213eee7f1820aa0c.yaml

@@ -1,5 +0,0 @@
----
-features:
-  - |
-    Support to create directly VNFFG and NS from its descriptor template
-    without creating VNFFGD and NSD.

releasenotes/notes/add-vnffg-and-vnf-ids-to-ns-list-commands-9d462efc103f8ecb.yaml

@@ -1,9 +0,0 @@
----
-features:
-  - |
-    Add 'vnf_ids' and 'vnffg_ids' fields in outputs from network
-    service list command. Users can know which VNFs or VNFFGs,
-    belongs to specific NS.
-    Add 'ns_id' field to VNFFG list command, that shows the
-    network service the current VNFFG belongs to.
-

releasenotes/notes/bug-1750865-04c3ebd0c3f8af29.yaml

@@ -1,4 +0,0 @@
----
-fixes:
-  - |
-    The VNFFGD CLI cannot show the VNFFGD template.

releasenotes/notes/bug-1754556-53268d3081fa18d1.yaml

@@ -1,4 +0,0 @@
----
-fixes:
-  - |
-    Add documentation for python-tackerclient.

releasenotes/notes/bug-1754793-54446bcd0a4e84aa.yaml

@@ -1,4 +0,0 @@
----
-fixes:
-  - |
-    Fix the VNFFG update osc command misusing create_vnffg function.

releasenotes/notes/bug-1754926-06ac4d7ffd17b5ce.yaml

@@ -1,4 +0,0 @@
----
-fixes:
-  - |
-    Fix local test fail with pypy.

releasenotes/notes/clustering-service-cli-e15cc6627de293fa.yaml

@@ -1,4 +0,0 @@
----
-features:
-  - |
-    Enable CLI to support clustering service in Tacker Server.

releasenotes/notes/del-project_and_user_id-e9dd396f83a162d6.yaml

@@ -1,6 +0,0 @@
----
-features:
-  -
-    As user gives input of project and user name in vim_config.yaml,
-    delete the user and project id from the vim specific commands
-    output.

releasenotes/notes/deprecated-tacker-command-29121558bd748082.yaml

@@ -1,7 +0,0 @@
----
-deprecations:
-  - |
-    tacker CLI is deprecated, will be deleted after Rocky release.
-    Use `openstack CLI`_ instead.
-
-    .. _openstack CLI: https://docs.openstack.org/python-tackerclient/latest/cli/index.html

releasenotes/notes/drop-py-2-7-b2052825c4b92b52.yaml

@@ -1,6 +0,0 @@
----
-upgrade:
-  - |
-    Python 2.7 support has been dropped. Last release of python-tackerclient
-    to support python 2.7 is OpenStack Train. The minimum version of Python now
-    supported by python-tackerclient is Python 3.6.

releasenotes/notes/tacker-support-python-openstackclient-b88b20b80b872229.yaml

@@ -1,4 +0,0 @@
----
-features:
-  - |
-    Add python-vnfd, vnf, nsd, ns, vnffgd, vnffg, event commands support.

releasenotes/notes/update-vim-without-config-c3b637741889eff6.yaml

@@ -1,3 +0,0 @@
----
-features:
-  - VIM can be updated without config-file argument in tacker vim-update command.

releasenotes/source/conf.py

@@ -36,8 +36,8 @@
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
-    'reno.sphinxext',
-    'openstackdocstheme',
+    'oslosphinx',
+    'reno.sphinxext'
 ]
 
 # Add any paths that contain templates here, relative to this directory.
@@ -56,9 +56,14 @@ master_doc = 'index'
 project = u'Tacker Client Release Notes'
 copyright = u'2016, Tacker Developers'
 
-# Release notes are version independent.
-release = ''
-version = ''
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+import pbr.version
+tacker_client_version = pbr.version.VersionInfo('python-tackerclient')
+release = tacker_client_version.version_string_with_vcs()
+version = tacker_client_version.canonical_version_string()
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -90,7 +95,7 @@ exclude_patterns = []
 # show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'native'
+pygments_style = 'sphinx'
 
 # A list of ignored prefixes for module index sorting.
 # modindex_common_prefix = []
@@ -100,7 +105,7 @@ pygments_style = 'native'
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'openstackdocs'
+html_theme = 'default'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -131,6 +136,10 @@ html_theme = 'openstackdocs'
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
 
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+# html_last_updated_fmt = '%b %d, %Y'
+
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
 # html_use_smartypants = True
@@ -253,9 +262,3 @@ texinfo_documents = [
 
 # -- Options for Internationalization output ------------------------------
 locale_dirs = ['locale/']
-
-# -- Options for openstackdocstheme -------------------------------------------
-openstackdocs_repo_name = 'openstack/python-tackerclient'
-openstackdocs_bug_project = 'python-tackerclient'
-openstackdocs_bug_tag = ''
-openstackdocs_auto_name = False

releasenotes/source/index.rst

@@ -7,11 +7,4 @@ Contents:
    :maxdepth: 2
 
    unreleased
-   ussuri
-   train
-   stein
-   rocky
-   queens
-   pike
-   ocata
    newton

releasenotes/source/ocata.rst

@@ -1,6 +0,0 @@
-===================================
- Ocata Series Release Notes
-===================================
-
-.. release-notes::
-   :branch: origin/stable/ocata

releasenotes/source/pike.rst

@@ -1,6 +0,0 @@
-===================================
- Pike Series Release Notes
-===================================
-
-.. release-notes::
-   :branch: stable/pike

releasenotes/source/queens.rst

@@ -1,6 +0,0 @@
-===================================
- Queens Series Release Notes
-===================================
-
-.. release-notes::
-   :branch: stable/queens

releasenotes/source/rocky.rst

@@ -1,6 +0,0 @@
-===================================
- Rocky Series Release Notes
-===================================
-
-.. release-notes::
-   :branch: stable/rocky

releasenotes/source/stein.rst

@@ -1,6 +0,0 @@
-===================================
- Stein Series Release Notes
-===================================
-
-.. release-notes::
-   :branch: stable/stein

releasenotes/source/train.rst

@@ -1,6 +0,0 @@
-==========================
-Train Series Release Notes
-==========================
-
-.. release-notes::
-   :branch: stable/train

releasenotes/source/ussuri.rst

@@ -1,6 +0,0 @@
-===========================
-Ussuri Series Release Notes
-===========================
-
-.. release-notes::
-   :branch: stable/ussuri

requirements.txt

@@ -1,18 +1,19 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-pbr!=2.1.0,>=2.0.0 # Apache-2.0
-cliff!=2.9.0,>=2.8.0 # Apache-2.0
+pbr>=1.8 # Apache-2.0
+cliff>=2.3.0 # Apache-2.0
 iso8601>=0.1.11 # MIT
-netaddr>=0.7.18 # BSD
-requests>=2.14.2 # Apache-2.0
+netaddr!=0.7.16,>=0.7.13 # BSD
+requests!=2.12.2,>=2.10.0 # Apache-2.0
 python-keystoneclient>=3.8.0 # Apache-2.0
-simplejson>=3.5.1 # MIT
-six>=1.10.0 # MIT
-stevedore>=1.20.0 # Apache-2.0
-Babel!=2.4.0,>=2.3.4 # BSD
-oslo.i18n>=3.15.3 # Apache-2.0
-osc-lib>=1.8.0 # Apache-2.0
-oslo.log>=3.36.0 # Apache-2.0
-oslo.utils>=3.40.0 # Apache-2.0
-oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
+simplejson>=2.2.0 # MIT
+six>=1.9.0 # MIT
+stevedore>=1.17.1 # Apache-2.0
+Babel>=2.3.4 # BSD
+
+oslo.i18n>=2.1.0 # Apache-2.0
+oslo.log>=3.11.0 # Apache-2.0
+oslo.utils>=3.18.0 # Apache-2.0
+oslosphinx>=4.7.0 # Apache-2.0
+oslo.serialization>=1.10.0 # Apache-2.0

setup.cfg

@@ -4,9 +4,8 @@ summary = CLI and Client Library for OpenStack Tacker
 description-file =
     README.rst
 author = OpenStack
-author-email = openstack-discuss@lists.openstack.org
-home-page = https://docs.openstack.org/python-tackerclient/
-python-requires = >=3.6
+author-email = openstack-dev@lists.openstack.org
+home-page = http://docs.openstack.org/developer/tacker/
 classifier =
     Environment :: OpenStack
     Intended Audience :: Developers
@@ -15,83 +14,30 @@ classifier =
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
     Programming Language :: Python
-    Programming Language :: Python :: Implementation :: CPython
-    Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 2
+    Programming Language :: Python :: 2.7
 
 [files]
 packages =
     tackerclient
 
+[global]
+setup-hooks =
+    pbr.hooks.setup_hook
+
 [entry_points]
 console_scripts =
     tacker = tackerclient.shell:main
 
-openstack.cli.extension =
-    tackerclient = tackerclient.osc.plugin
+[build_sphinx]
+all_files = 1
+build-dir = doc/build
+source-dir = doc/source
 
-openstack.tackerclient.v1 =
-     vim_register = tackerclient.osc.v1.nfvo.vim:CreateVIM
-     vim_list = tackerclient.osc.v1.nfvo.vim:ListVIM
-     vim_set = tackerclient.osc.v1.nfvo.vim:UpdateVIM
-     vim_delete = tackerclient.osc.v1.nfvo.vim:DeleteVIM
-     vim_show = tackerclient.osc.v1.nfvo.vim:ShowVIM
-     vnf_descriptor_create = tackerclient.osc.v1.vnfm.vnfd:CreateVNFD
-     vnf_descriptor_delete = tackerclient.osc.v1.vnfm.vnfd:DeleteVNFD
-     vnf_descriptor_list = tackerclient.osc.v1.vnfm.vnfd:ListVNFD
-     vnf_descriptor_show = tackerclient.osc.v1.vnfm.vnfd:ShowVNFD
-     vnf_descriptor_template_show = tackerclient.osc.v1.vnfm.vnfd:ShowTemplateVNFD
-     vnf_create = tackerclient.osc.v1.vnfm.vnf:CreateVNF
-     vnf_delete = tackerclient.osc.v1.vnfm.vnf:DeleteVNF
-     vnf_list = tackerclient.osc.v1.vnfm.vnf:ListVNF
-     vnf_show = tackerclient.osc.v1.vnfm.vnf:ShowVNF
-     vnf_resource_list = tackerclient.osc.v1.vnfm.vnf:ListVNFResources
-     vnf_set = tackerclient.osc.v1.vnfm.vnf:UpdateVNF
-     vnf_scale = tackerclient.osc.v1.vnfm.vnf:ScaleVNF
-     vnf_graph_descriptor_create = tackerclient.osc.v1.nfvo.vnffgd:CreateVNFFGD
-     vnf_graph_descriptor_delete = tackerclient.osc.v1.nfvo.vnffgd:DeleteVNFFGD
-     vnf_graph_descriptor_list = tackerclient.osc.v1.nfvo.vnffgd:ListVNFFGD
-     vnf_graph_descriptor_show = tackerclient.osc.v1.nfvo.vnffgd:ShowVNFFGD
-     vnf_graph_descriptor_template_show = tackerclient.osc.v1.nfvo.vnffgd:ShowTemplateVNFFGD
-     ns_descriptor_create = tackerclient.osc.v1.nfvo.nsd:CreateNSD
-     ns_descriptor_delete = tackerclient.osc.v1.nfvo.nsd:DeleteNSD
-     ns_descriptor_list = tackerclient.osc.v1.nfvo.nsd:ListNSD
-     ns_descriptor_show = tackerclient.osc.v1.nfvo.nsd:ShowNSD
-     ns_descriptor_template_show = tackerclient.osc.v1.nfvo.nsd:ShowTemplateNSD
-     nfv_event_show = tackerclient.osc.v1.events.events:ShowEvent
-     nfv_event_list = tackerclient.osc.v1.events.events:ListEvent
-     ns_create = tackerclient.osc.v1.nfvo.ns:CreateNS
-     ns_delete = tackerclient.osc.v1.nfvo.ns:DeleteNS
-     ns_list = tackerclient.osc.v1.nfvo.ns:ListNS
-     ns_show = tackerclient.osc.v1.nfvo.ns:ShowNS
-     vnf_graph_create = tackerclient.osc.v1.nfvo.vnffg:CreateVNFFG
-     vnf_graph_delete = tackerclient.osc.v1.nfvo.vnffg:DeleteVNFFG
-     vnf_graph_set = tackerclient.osc.v1.nfvo.vnffg:UpdateVNFFG
-     vnf_graph_list = tackerclient.osc.v1.nfvo.vnffg:ListVNFFG
-     vnf_graph_show = tackerclient.osc.v1.nfvo.vnffg:ShowVNFFG
-     vnf_network_forwarding_path_list = tackerclient.osc.v1.nfvo.vnffg:ListNFP
-     vnf_network_forwarding_path_show = tackerclient.osc.v1.nfvo.vnffg:ShowNFP
-     vnf_classifier_list = tackerclient.osc.v1.nfvo.vnffg:ListFC
-     vnf_classifier_show = tackerclient.osc.v1.nfvo.vnffg:ShowFC
-     vnf_chain_list = tackerclient.osc.v1.nfvo.vnffg:ListSFC
-     vnf_chain_show = tackerclient.osc.v1.nfvo.vnffg:ShowSFC
-     vnf_package_create = tackerclient.osc.v1.vnfpkgm.vnf_package:CreateVnfPackage
-     vnf_package_list = tackerclient.osc.v1.vnfpkgm.vnf_package:ListVnfPackage
-     vnf_package_show = tackerclient.osc.v1.vnfpkgm.vnf_package:ShowVnfPackage
-     vnf_package_upload = tackerclient.osc.v1.vnfpkgm.vnf_package:UploadVnfPackage
-     vnf_package_delete = tackerclient.osc.v1.vnfpkgm.vnf_package:DeleteVnfPackage
-     vnf_package_update = tackerclient.osc.v1.vnfpkgm.vnf_package:UpdateVnfPackage
-     vnf_package_download = tackerclient.osc.v1.vnfpkgm.vnf_package:DownloadVnfPackage
-     vnf_package_artifact_download = tackerclient.osc.v1.vnfpkgm.vnf_package:DownloadVnfPackageArtifact
-     vnflcm_create = tackerclient.osc.v1.vnflcm.vnflcm:CreateVnfLcm
-     vnflcm_show = tackerclient.osc.v1.vnflcm.vnflcm:ShowVnfLcm
-     vnflcm_list = tackerclient.osc.v1.vnflcm.vnflcm:ListVnfLcm
-     vnflcm_instantiate = tackerclient.osc.v1.vnflcm.vnflcm:InstantiateVnfLcm
-     vnflcm_terminate = tackerclient.osc.v1.vnflcm.vnflcm:TerminateVnfLcm
-     vnflcm_delete = tackerclient.osc.v1.vnflcm.vnflcm:DeleteVnfLcm
-     vnflcm_heal = tackerclient.osc.v1.vnflcm.vnflcm:HealVnfLcm
-     vnflcm_update = tackerclient.osc.v1.vnflcm.vnflcm:UpdateVnfLcm
-     vnflcm_scale = tackerclient.osc.v1.vnflcm.vnflcm:ScaleVnfLcm
-     vnflcm_op_rollback = tackerclient.osc.v1.vnflcm.vnflcm_op_occs:RollbackVnfLcmOp
+[build_releasenotes]
+all_files = 1
+build-dir = releasenotes/build
+source-dir = releasenotes/source
+
+[wheel]
+universal = 1

setup.py

@@ -13,8 +13,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
+# In python < 2.7.4, a lazy loading of package `pbr` will break
+# setuptools if some other modules registered functions in `atexit`.
+# solution from: http://bugs.python.org/issue15881#msg170215
+try:
+    import multiprocessing  # noqa
+except ImportError:
+    pass
+
 setuptools.setup(
-    setup_requires=['pbr>=2.0.0'],
+    setup_requires=['pbr>=1.8'],
     pbr=True)

tackerclient/client.py

@@ -144,8 +144,6 @@ class HTTPClient(object):
             verify=self.verify_cert,
             timeout=self.timeout,
             **kwargs)
-        if resp.headers.get('content-type') == 'application/zip':
-            return resp, resp.content
 
         return resp, resp.text
 
@@ -165,7 +163,6 @@ class HTTPClient(object):
         # re-authenticate and try again. If it still fails, bail.
         try:
             kwargs.setdefault('headers', {})
-            kwargs.setdefault('content_type', kwargs.get('content_type'))
             if self.auth_token is None:
                 self.auth_token = ""
             kwargs['headers']['X-Auth-Token'] = self.auth_token
@@ -293,10 +290,6 @@ class SessionClient(adapter.Adapter):
             headers.setdefault('Content-Type', content_type)
 
         resp = super(SessionClient, self).request(*args, **kwargs)
-
-        if resp.headers.get('content-type') == 'application/zip':
-            return resp, resp.content
-
         return resp, resp.text
 
     def _check_uri_length(self, url):

tackerclient/common/_i18n.py

@@ -14,7 +14,7 @@
 
 """oslo.i18n integration module.
 
-See https://docs.openstack.org/oslo.i18n/latest/user/index.html.
+See http://docs.openstack.org/developer/oslo.i18n/usage.html .
 
 """
 
@@ -35,6 +35,16 @@ _C = _translators.contextual_form
 # requires oslo.i18n >=2.1.0
 _P = _translators.plural_form
 
+# Translators for log levels.
+#
+# The abbreviated names are meant to reflect the usual use of a short
+# name like '_'. The "L" is for "log" and the other letter comes from
+# the level.
+_LI = _translators.log_info
+_LW = _translators.log_warning
+_LE = _translators.log_error
+_LC = _translators.log_critical
+
 
 def get_available_languages():
-    return oslo_i18n.get_available_languages(DOMAIN)
+        return oslo_i18n.get_available_languages(DOMAIN)

tackerclient/common/command.py

@@ -14,8 +14,6 @@
 #    under the License.
 #
 
-from sys import stderr
-
 from cliff import command
 
 
@@ -25,8 +23,6 @@ class OpenStackCommand(command.Command):
     api = None
 
     def run(self, parsed_args):
-        stderr.write("Deprecated: tacker command line is deprecated, "
-                     "will be deleted after Rocky is released.\n")
         if not self.api:
             return
         else:

tackerclient/common/exceptions.py

@@ -203,10 +203,6 @@ class InvalidContentType(TackerClientException):
     message = _("Invalid content type %(content_type)s.")
 
 
-class InvalidInput(TackerClientException):
-    message = _("Invalid input: %(reason)s")
-
-
 # Command line exceptions
 
 class TackerCLIError(TackerException):

tackerclient/common/utils.py

@@ -57,7 +57,7 @@ def get_client_class(api_name, version, version_map):
                 "one of: %(map_keys)s")
         msg = msg % {'api_name': api_name, 'version': version,
                      'map_keys': ', '.join(version_map.keys())}
-        raise exceptions.UnsupportedVersion(message=msg)
+        raise exceptions.UnsupportedVersion(msg)
 
     return importutils.import_class(client_path)
 

tackerclient/common/validators.py

@@ -54,7 +54,7 @@ def validate_int_range(parsed_args, attr_name, min_value=None, max_value=None):
                {'attr_name': attr_name.replace('_', '-'),
                 'val': val})
 
-    raise exceptions.CommandError(message=msg)
+    raise exceptions.CommandError(msg)
 
 
 def validate_ip_subnet(parsed_args, attr_name):
@@ -65,5 +65,5 @@ def validate_ip_subnet(parsed_args, attr_name):
         netaddr.IPNetwork(val)
     except (netaddr.AddrFormatError, ValueError):
         raise exceptions.CommandError(
-            message=(_('%(attr_name)s "%(val)s" is not a valid CIDR.') %
-                     {'attr_name': attr_name.replace('_', '-'), 'val': val}))
+            (_('%(attr_name)s "%(val)s" is not a valid CIDR.') %
+             {'attr_name': attr_name.replace('_', '-'), 'val': val}))

tackerclient/i18n.py

@@ -16,3 +16,13 @@ _translators = i18n.TranslatorFactory(domain='tackerclient')
 
 # The primary translation function using the well-known name "_"
 _ = _translators.primary
+
+# Translators for log levels.
+#
+# The abbreviated names are meant to reflect the usual use of a short
+# name like '_'. The "L" is for "log" and the other letter comes from
+# the level.
+_LI = _translators.log_info
+_LW = _translators.log_warning
+_LE = _translators.log_error
+_LC = _translators.log_critical

tackerclient/osc/plugin.py

@@ -1,61 +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.
-#
-
-"""OpenStackClient plugin for nfv-orchestration service."""
-
-import logging
-
-from osc_lib import utils
-
-
-LOG = logging.getLogger(__name__)
-
-# Required by the OSC plugin interface
-DEFAULT_TACKER_API_VERSION = '1'
-API_NAME = 'tackerclient'
-API_VERSION_OPTION = 'os_tacker_api_version'
-API_VERSIONS = {
-    '1': 'tackerclient.v1_0.client.Client',
-}
-
-
-def make_client(instance):
-    """Returns a client to the ClientManager."""
-
-    tacker_client = utils.get_client_class(
-        API_NAME,
-        instance._api_version[API_NAME],
-        API_VERSIONS)
-    LOG.debug('Instantiating tacker client: %s', tacker_client)
-
-    kwargs = {'service_type': 'nfv-orchestration',
-              'region_name': instance._region_name,
-              'endpoint_type': instance._interface,
-              'interface': instance._interface,
-              'session': instance.session
-              }
-
-    client = tacker_client(**kwargs)
-
-    return client
-
-
-def build_option_parser(parser):
-    """Hook to add global options."""
-    parser.add_argument(
-        '--os-tacker-api-version',
-        metavar='<tacker-api-version>',
-        default=utils.env(
-            'OS_TACKER_API_VERSION',
-            default=DEFAULT_TACKER_API_VERSION))
-    return parser

tackerclient/osc/sdk_utils.py

@@ -1,129 +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.
-
-import sys
-
-from oslo_utils import encodeutils
-
-
-def get_osc_show_columns_for_sdk_resource(
-    sdk_resource,
-    osc_column_map,
-    invisible_columns=None
-):
-    """Get and filter the display and attribute columns for an SDK resource.
-
-    Common utility function for preparing the output of an OSC show command.
-    Some of the columns may need to get renamed, others made invisible.
-
-    :param sdk_resource: An SDK resource
-    :param osc_column_map: A hash of mappings for display column names
-    :param invisible_columns: A list of invisible column names
-
-    :returns: Two tuples containing the names of the display and attribute
-              columns
-    """
-
-    if getattr(sdk_resource, 'allow_get', None) is not None:
-        resource_dict = sdk_resource.to_dict(
-            body=True, headers=False, ignore_none=False)
-    else:
-        resource_dict = sdk_resource
-
-    # Build the OSC column names to display for the SDK resource.
-    attr_map = {}
-    display_columns = list(resource_dict.keys())
-    invisible_columns = [] if invisible_columns is None else invisible_columns
-    for col_name in invisible_columns:
-        if col_name in display_columns:
-            display_columns.remove(col_name)
-    for sdk_attr, osc_attr in osc_column_map.items():
-        if sdk_attr in display_columns:
-            attr_map[osc_attr] = sdk_attr
-            display_columns.remove(sdk_attr)
-        if osc_attr not in display_columns:
-            display_columns.append(osc_attr)
-    sorted_display_columns = sorted(display_columns)
-
-    # Build the SDK attribute names for the OSC column names.
-    attr_columns = []
-    for column in sorted_display_columns:
-        new_column = attr_map[column] if column in attr_map else column
-        attr_columns.append(new_column)
-    return tuple(sorted_display_columns), tuple(attr_columns)
-
-
-class DictModel(dict):
-    """Convert dict into an object that provides attribute access to values."""
-
-    def __init__(self, *args, **kwargs):
-        """Convert dict values to DictModel values."""
-        super(DictModel, self).__init__(*args, **kwargs)
-
-        def needs_upgrade(item):
-            return isinstance(item, dict) and not isinstance(item, DictModel)
-
-        def upgrade(item):
-            """Upgrade item if it needs to be upgraded."""
-            if needs_upgrade(item):
-                return DictModel(item)
-            else:
-                return item
-
-        for key, value in self.items():
-            if isinstance(value, (list, tuple)):
-                # Keep the same type but convert dicts to DictModels
-                self[key] = type(value)(
-                    (upgrade(item) for item in value)
-                )
-            elif needs_upgrade(value):
-                # Change dict instance values to DictModel instance values
-                self[key] = DictModel(value)
-
-    def __getattr__(self, name):
-        try:
-            return self[name]
-        except KeyError as e:
-            raise AttributeError(e)
-
-    def __setattr__(self, name, value):
-        self[name] = value
-
-    def __delattr__(self, name):
-        del self[name]
-
-    def __str__(self):
-        pairs = ['%s=%s' % (k, v) for k, v in self.items()]
-        return ', '.join(sorted(pairs))
-
-
-def save_data(data, path):
-    """Save data to the specified path.
-
-    :param data: binary or string data
-    :param path: file path to save data
-    """
-    if path is None:
-        vnfpackage = getattr(sys.stdout, 'buffer', sys.stdout)
-    else:
-        mode = 'wb' if isinstance(data, bytes) else 'w'
-        vnfpackage = open(path, mode)
-    try:
-        vnfpackage.write(data)
-    finally:
-        vnfpackage.close()
-
-
-def exit(msg=None, exit_code=1):
-    if msg:
-        print(encodeutils.safe_decode(msg))
-    sys.exit(exit_code)

tackerclient/osc/utils.py

@@ -1,214 +0,0 @@
-# Copyright 2016 NEC Corporation
-#
-#    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.
-
-"""This module should contain OSC plugin generic methods.
-
-Methods in this module are candidates adopted to osc-lib.
-
-Stuffs specific to tackerclient OSC plugin should not be added
-to this module. They should go to tackerclient.osc.v1.utils.
-"""
-
-import operator
-
-from cliff import columns as cliff_columns
-from keystoneclient import exceptions as identity_exc
-from keystoneclient.v3 import domains
-from keystoneclient.v3 import projects
-from osc_lib import utils
-from oslo_serialization import jsonutils
-
-from tackerclient.i18n import _
-
-
-LIST_BOTH = 'both'
-LIST_SHORT_ONLY = 'short_only'
-LIST_LONG_ONLY = 'long_only'
-
-
-def format_dict_with_indention(data):
-    """Return a formatted string of key value pairs
-
-    :param data: a dict
-    :rtype: a string formatted to key='value'
-    """
-
-    if data is None:
-        return None
-    return jsonutils.dumps(data, indent=4)
-
-
-def get_column_definitions(attr_map, long_listing):
-    """Return table headers and column names for a listing table.
-
-    :param attr_map: a list of table entry definitions.
-      Each entry should be a tuple consisting of
-      (API attribute name, header name, listing mode). For example:
-      (('id', 'ID', LIST_BOTH),
-       ('name', 'Name', LIST_BOTH),
-       ('tenant_id', 'Project', LIST_LONG_ONLY))
-      The third field of each tuple must be one of LIST_BOTH,
-      LIST_LONG_ONLY (a corresponding column is shown only in a long mode), or
-      LIST_SHORT_ONLY (a corresponding column is shown only in a short mode).
-    :param long_listing: A boolean value which indicates a long listing
-      or not. In most cases, parsed_args.long is passed to this argument.
-    :return: A tuple of a list of table headers and a list of column names.
-    """
-
-    if long_listing:
-        headers = [hdr for col, hdr, listing_mode in attr_map
-                   if listing_mode in (LIST_BOTH, LIST_LONG_ONLY)]
-        columns = [col for col, hdr, listing_mode in attr_map
-                   if listing_mode in (LIST_BOTH, LIST_LONG_ONLY)]
-    else:
-        headers = [hdr for col, hdr, listing_mode in attr_map
-                   if listing_mode in (LIST_BOTH, LIST_SHORT_ONLY)]
-        columns = [col for col, hdr, listing_mode in attr_map
-                   if listing_mode in (LIST_BOTH, LIST_SHORT_ONLY)]
-
-    return headers, columns
-
-
-def get_columns(item, attr_map=None):
-    """Return pair of resource attributes and corresponding display names.
-
-    Assume the following item and attr_map are passed.
-    item: {'id': 'myid', 'name': 'myname',
-           'foo': 'bar', 'tenant_id': 'mytenan'}
-    attr_map:
-      (('id', 'ID', LIST_BOTH),
-       ('name', 'Name', LIST_BOTH),
-       ('tenant_id', 'Project', LIST_LONG_ONLY))
-
-    This method returns:
-
-       (('id', 'name', 'tenant_id', 'foo'),  # attributes
-        ('ID', 'Name', 'Project', 'foo')     # display names
-
-    Both tuples of attributes and display names are sorted by display names
-    in the alphabetical order.
-    Attributes not found in a given attr_map are kept as-is.
-
-    :param item: a dictionary which represents a resource.
-      Keys of the dictionary are expected to be attributes of the resource.
-      Values are not referred to by this method.
-    :param attr_map: a list of mapping from attribute to display name.
-      The same format is used as for get_column_definitions attr_map.
-    :return: A pair of tuple of attributes and tuple of display names.
-    """
-    attr_map = attr_map or tuple([])
-    _attr_map_dict = dict((col, hdr) for col, hdr, listing_mode in attr_map)
-
-    columns = [(column, _attr_map_dict.get(column, column))
-               for column in item.keys()]
-    columns = sorted(columns, key=operator.itemgetter(1))
-    return (tuple(col[0] for col in columns),
-            tuple(col[1] for col in columns))
-
-
-# TODO(amotoki): Use osc-lib version once osc-lib provides this.
-def add_project_owner_option_to_parser(parser):
-    """Register project and project domain options.
-
-    :param parser: argparse.Argument parser object.
-
-    """
-    parser.add_argument(
-        '--project',
-        metavar='<project>',
-        help=_("Owner's project (name or ID)")
-    )
-    # Borrowed from openstackclient.identity.common
-    # as it is not exposed officially.
-    parser.add_argument(
-        '--project-domain',
-        metavar='<project-domain>',
-        help=_('Domain the project belongs to (name or ID). '
-               'This can be used in case collisions between project names '
-               'exist.'),
-    )
-
-
-# The following methods are borrowed from openstackclient.identity.common
-# as it is not exposed officially.
-# TODO(amotoki): Use osc-lib version once osc-lib provides this.
-
-
-def find_domain(identity_client, name_or_id):
-    return _find_identity_resource(identity_client.domains, name_or_id,
-                                   domains.Domain)
-
-
-def find_project(identity_client, name_or_id, domain_name_or_id=None):
-    domain_id = _get_domain_id_if_requested(identity_client, domain_name_or_id)
-    if not domain_id:
-        return _find_identity_resource(identity_client.projects, name_or_id,
-                                       projects.Project)
-    else:
-        return _find_identity_resource(identity_client.projects, name_or_id,
-                                       projects.Project, domain_id=domain_id)
-
-
-def _get_domain_id_if_requested(identity_client, domain_name_or_id):
-    if not domain_name_or_id:
-        return None
-    domain = find_domain(identity_client, domain_name_or_id)
-    return domain.id
-
-
-def _find_identity_resource(identity_client_manager, name_or_id,
-                            resource_type, **kwargs):
-    """Find a specific identity resource.
-
-    Using keystoneclient's manager, attempt to find a specific resource by its
-    name or ID. If Forbidden to find the resource (a common case if the user
-    does not have permission), then return the resource by creating a local
-    instance of keystoneclient's Resource.
-
-    The parameter identity_client_manager is a keystoneclient manager,
-    for example: keystoneclient.v3.users or keystoneclient.v3.projects.
-
-    The parameter resource_type is a keystoneclient resource, for example:
-    keystoneclient.v3.users.User or keystoneclient.v3.projects.Project.
-
-    :param identity_client_manager: the manager that contains the resource
-    :type identity_client_manager: `keystoneclient.base.CrudManager`
-    :param name_or_id: the resources's name or ID
-    :type name_or_id: string
-    :param resource_type: class that represents the resource type
-    :type resource_type: `keystoneclient.base.Resource`
-
-    :returns: the resource in question
-    :rtype: `keystoneclient.base.Resource`
-
-    """
-
-    try:
-        identity_resource = utils.find_resource(identity_client_manager,
-                                                name_or_id, **kwargs)
-        if identity_resource is not None:
-            return identity_resource
-    except identity_exc.Forbidden:
-        pass
-
-    return resource_type(None, {'id': name_or_id, 'name': name_or_id})
-
-
-# The above are borrowed from openstackclient.identity.common.
-
-
-class FormatComplexDataColumn(cliff_columns.FormattableColumn):
-
-    def human_readable(self):
-        return format_dict_with_indention(self._value)

tackerclient/osc/v1/events/events.py

@@ -1,116 +0,0 @@
-# Copyright 2018 OpenStack Foundation
-# All Rights Reserved.
-#
-#    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.
-#
-
-from osc_lib.command import command
-from osc_lib import utils
-
-from tackerclient.i18n import _
-from tackerclient.osc import sdk_utils
-from tackerclient.osc import utils as tacker_osc_utils
-from tackerclient.tacker import v1_0 as tackerV10
-
-_attr_map = (
-    ('id', 'ID', tacker_osc_utils.LIST_BOTH),
-    ('resource_type', 'Resource Type', tacker_osc_utils.LIST_BOTH),
-    ('resource_id', 'Resource ID', tacker_osc_utils.LIST_BOTH),
-    ('resource_state', 'Resource State', tacker_osc_utils.LIST_BOTH),
-    ('event_type', 'Event Type', tacker_osc_utils.LIST_BOTH),
-    ('timestamp', 'Timestamp', tacker_osc_utils.LIST_BOTH),
-    ('event_details', 'Event Details', tacker_osc_utils.LIST_LONG_ONLY),
-)
-
-_EVENT = "event"
-
-events_path = '/events'
-
-
-def _get_columns(item):
-    column_map = {}
-    return sdk_utils.get_osc_show_columns_for_sdk_resource(item, column_map)
-
-
-class ShowEvent(command.ShowOne):
-    _description = _("Show event given the event id.")
-
-    def get_parser(self, prog_name):
-        parser = super(ShowEvent, self).get_parser(prog_name)
-        parser.add_argument(
-            _EVENT,
-            metavar="ID",
-            help=_("ID of event to display")
-        )
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        obj_id = tackerV10.find_resourceid_by_name_or_id(
-            client, _EVENT, parsed_args.event)
-        obj = client.show_event(obj_id)
-        display_columns, columns = _get_columns(obj[_EVENT])
-        data = utils.get_item_properties(
-            sdk_utils.DictModel(obj[_EVENT]),
-            columns,)
-        return (display_columns, data)
-
-
-class ListEvent(command.Lister):
-    _description = _("List events of resources.")
-
-    def get_parser(self, prog_name):
-        parser = super(ListEvent, self).get_parser(prog_name)
-        parser.add_argument(
-            '--id',
-            help=_("id of the event to look up."))
-        parser.add_argument(
-            '--resource-type',
-            help=_("resource type of the events to look up."))
-        parser.add_argument(
-            '--resource-id',
-            help=_("resource id of the events to look up."))
-        parser.add_argument(
-            '--resource-state',
-            help=_("resource state of the events to look up."))
-        parser.add_argument(
-            '--event-type',
-            help=_("event type of the events to look up."))
-        parser.add_argument(
-            '--long',
-            action='store_true',
-            help=_("List additional fields in output"))
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        _params = {}
-        if parsed_args.id:
-            _params['id'] = parsed_args.id
-        if parsed_args.resource_id:
-            _params['resource_id'] = parsed_args.resource_id
-        if parsed_args.resource_state:
-            _params['resource_state'] = parsed_args.resource_id
-        if parsed_args.event_type:
-            _params['event_type'] = parsed_args.event_type
-        if parsed_args.resource_type:
-            _params['resource_type'] = parsed_args.resource_type
-        events = client.list('events', events_path, True, **_params)
-        data = {}
-        data['events'] = events['events']
-        headers, columns = tacker_osc_utils.get_column_definitions(
-            _attr_map, long_listing=parsed_args.long)
-        return (headers,
-                (utils.get_dict_properties(
-                    s, columns,
-                ) for s in data[_EVENT + 's']))

tackerclient/osc/v1/nfvo/ns.py

@@ -1,256 +0,0 @@
-# Copyright 2018 OpenStack Foundation.
-# All Rights Reserved
-#
-#    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.
-#
-
-import yaml
-
-from osc_lib.command import command
-from osc_lib import utils
-
-from tackerclient.common import exceptions
-from tackerclient.i18n import _
-from tackerclient.osc import sdk_utils
-from tackerclient.osc import utils as tacker_osc_utils
-from tackerclient.tacker import v1_0 as tackerV10
-
-_attr_map = (
-    ('id', 'ID', tacker_osc_utils.LIST_BOTH),
-    ('name', 'Name', tacker_osc_utils.LIST_BOTH),
-    ('nsd_id', 'NSD ID', tacker_osc_utils.LIST_BOTH),
-    ('vnf_ids', 'VNF IDs', tacker_osc_utils.LIST_BOTH),
-    ('vnffg_ids', 'VNFFG IDs', tacker_osc_utils.LIST_BOTH),
-    ('mgmt_ip_addresses', 'Mgmt Ip Addresses', tacker_osc_utils.LIST_BOTH),
-    ('status', 'Status', tacker_osc_utils.LIST_BOTH),
-)
-
-_NS = 'ns'
-_RESOURCE = 'resource'
-
-
-def _get_columns(item):
-    column_map = {
-        'tenant_id': 'project_id',
-    }
-    return sdk_utils.get_osc_show_columns_for_sdk_resource(item, column_map)
-
-
-class CreateNS(command.ShowOne):
-    _description = _("Create a new NS")
-
-    def get_parser(self, prog_name):
-        parser = super(CreateNS, self).get_parser(prog_name)
-        parser.add_argument(
-            'name', metavar='NAME',
-            help=_('Name for NS'))
-        parser.add_argument(
-            '--tenant-id', metavar='TENANT_ID',
-            help=_('The owner tenant ID'))
-        parser.add_argument(
-            '--description',
-            help=_('Set description for the NS'))
-        nsd_group = parser.add_mutually_exclusive_group(required=True)
-        nsd_group.add_argument(
-            '--nsd-id',
-            help=_('NSD ID to use as template to create NS'))
-        nsd_group.add_argument(
-            '--nsd-template',
-            help=_('NSD file to create NS'))
-        nsd_group.add_argument(
-            '--nsd-name',
-            help=_('NSD name to use as template to create NS'))
-        vim_group = parser.add_mutually_exclusive_group()
-        vim_group.add_argument(
-            '--vim-id',
-            help=_('VIM ID to use to create NS on the specified VIM'))
-        vim_group.add_argument(
-            '--vim-name',
-            help=_('VIM name to use to create NS on the specified VIM'))
-        parser.add_argument(
-            '--vim-region-name',
-            help=_('VIM Region to use to create NS on the specified VIM'))
-        parser.add_argument(
-            '--param-file',
-            help=_('Specify parameter YAML file'))
-        return parser
-
-    def args2body(self, parsed_args):
-        body = {_NS: {}}
-        body[_NS]['attributes'] = {}
-
-        if parsed_args.vim_region_name:
-            body[_NS].setdefault('placement_attr', {})['region_name'] = \
-                parsed_args.vim_region_name
-
-        client = self.app.client_manager.tackerclient
-        if parsed_args.vim_name:
-            _id = tackerV10.find_resourceid_by_name_or_id(client, 'vim',
-                                                          parsed_args.vim_name)
-            parsed_args.vim_id = _id
-        if parsed_args.nsd_name:
-            _id = tackerV10.find_resourceid_by_name_or_id(client, 'nsd',
-                                                          parsed_args.nsd_name)
-            parsed_args.nsd_id = _id
-        elif parsed_args.nsd_template:
-            with open(parsed_args.nsd_template) as f:
-                template = f.read()
-                try:
-                    template = yaml.load(
-                        template, Loader=yaml.SafeLoader)
-                except yaml.YAMLError as e:
-                    raise exceptions.InvalidInput(reason=e)
-                if not template:
-                    raise exceptions.InvalidInput(
-                        reason='The nsd file is empty')
-                body[_NS]['nsd_template'] = template
-
-        if parsed_args.param_file:
-            with open(parsed_args.param_file) as f:
-                param_yaml = f.read()
-            try:
-                param_yaml = yaml.load(
-                    param_yaml, Loader=yaml.SafeLoader)
-            except yaml.YAMLError as e:
-                raise exceptions.InvalidInput(reason=e)
-            if not param_yaml:
-                raise exceptions.InvalidInput(
-                    reason='The parameter file is empty')
-            body[_NS]['attributes'] = {'param_values': param_yaml}
-        tackerV10.update_dict(parsed_args, body[_NS],
-                              ['tenant_id', 'name', 'description',
-                               'nsd_id', 'vim_id'])
-        return body
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        ns = client.create_ns(self.args2body(parsed_args))
-        display_columns, columns = _get_columns(ns[_NS])
-        data = utils.get_item_properties(
-            sdk_utils.DictModel(ns[_NS]),
-            columns)
-        lstdata = list(data)
-        for index, value in enumerate(lstdata):
-            if value is None:
-                lstdata[index] = ''
-        data = tuple(lstdata)
-        return (display_columns, data)
-
-
-class DeleteNS(command.Command):
-    _description = _("Delete NS(s).")
-
-    def get_parser(self, prog_name):
-        parser = super(DeleteNS, self).get_parser(prog_name)
-        parser.add_argument(
-            _NS,
-            metavar="<NS>",
-            nargs="+",
-            help=_("NS(s) to delete (name or ID)")
-        )
-        parser.add_argument(
-            '--force',
-            default=False,
-            action='store_true',
-            help=_('Force delete Network Service')
-        )
-        return parser
-
-    def args2body(self, parsed_args):
-        if parsed_args.force:
-            body = {_NS: {'attributes': {'force': True}}}
-        else:
-            body = dict()
-        return body
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        failure = False
-        deleted_ids = []
-        failed_items = {}
-        body = self.args2body(parsed_args)
-        for resource_id in parsed_args.ns:
-            try:
-                obj = tackerV10.find_resourceid_by_name_or_id(
-                    client, _NS, resource_id)
-                client.delete_ns(obj, body)
-                deleted_ids.append(resource_id)
-            except Exception as e:
-                failure = True
-                failed_items[resource_id] = e
-        if failure:
-            msg = ''
-            if deleted_ids:
-                msg = (_('Successfully deleted %(resource)s(s):'
-                         ' %(deleted_list)s') % {'deleted_list':
-                                                 ', '.join(deleted_ids),
-                                                 'resource': _NS})
-            err_msg = _("\n\nUnable to delete the below"
-                        " %s(s):") % _NS
-            for failed_id, error in failed_items.items():
-                err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s')
-                            % {'failed_id': failed_id,
-                               'error': error})
-            msg += err_msg
-            raise exceptions.CommandError(message=msg)
-        else:
-            print((_('All specified %(resource)s(s) deleted successfully')
-                   % {'resource': _NS}))
-        return
-
-
-class ListNS(command.Lister):
-    _description = ("List (NS)s that belong to a given tenant.")
-
-    def get_parser(self, prog_name):
-        parser = super(ListNS, self).get_parser(prog_name)
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        data = client.list_nss()
-        headers, columns = tacker_osc_utils.get_column_definitions(
-            _attr_map, long_listing=None)
-        return (headers,
-                (utils.get_dict_properties(
-                    s, columns,
-                ) for s in data[_NS + 's']))
-
-
-class ShowNS(command.ShowOne):
-    _description = _("Display NS details")
-
-    def get_parser(self, prog_name):
-        parser = super(ShowNS, self).get_parser(prog_name)
-        parser.add_argument(
-            _NS,
-            metavar="<NS>",
-            help=_("NS to display (name or ID)")
-        )
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        obj_id = tackerV10.find_resourceid_by_name_or_id(
-            client, _NS, parsed_args.ns)
-        obj = client.show_ns(obj_id)
-        display_columns, columns = _get_columns(obj[_NS])
-        data = utils.get_item_properties(
-            sdk_utils.DictModel(obj[_NS]),
-            columns)
-        lstdata = list(data)
-        for index, value in enumerate(lstdata):
-            if value is None:
-                lstdata[index] = ''
-        data = tuple(lstdata)
-        return (display_columns, data)

tackerclient/osc/v1/nfvo/nsd.py

@@ -1,223 +0,0 @@
-# Copyright 2018 OpenStack Foundation
-# All Rights Reserved.
-#
-#    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.
-#
-
-import yaml
-
-from osc_lib.command import command
-from osc_lib import utils
-
-from tackerclient.common import exceptions
-from tackerclient.i18n import _
-from tackerclient.osc import sdk_utils
-from tackerclient.osc import utils as tacker_osc_utils
-from tackerclient.tacker import v1_0 as tackerV10
-
-_attr_map = (
-    ('id', 'ID', tacker_osc_utils.LIST_BOTH),
-    ('name', 'Name', tacker_osc_utils.LIST_BOTH),
-    ('template_source', 'Template_Source',
-     tacker_osc_utils.LIST_BOTH),
-    ('description', 'Description', tacker_osc_utils.LIST_BOTH),
-)
-
-_NSD = 'nsd'
-
-_formatters = {
-    'attributes': tacker_osc_utils.format_dict_with_indention,
-}
-
-
-def _get_columns(item):
-    column_map = {
-        'tenant_id': 'project_id',
-    }
-    return sdk_utils.get_osc_show_columns_for_sdk_resource(item, column_map)
-
-
-class CreateNSD(command.ShowOne):
-    _description = _("Create a new NSD.")
-
-    def get_parser(self, prog_name):
-        parser = super(CreateNSD, self).get_parser(prog_name)
-        parser.add_argument(
-            'name', metavar='NAME',
-            help=_('Name for NSD'))
-        parser.add_argument(
-            '--tenant-id', metavar='TENANT_ID',
-            help=_('The owner tenant ID or project ID'))
-        parser.add_argument(
-            '--nsd-file',
-            required=True,
-            help=_('YAML file with NSD parameters'))
-        parser.add_argument(
-            '--description',
-            help=_('Set a description for the NSD'))
-        return parser
-
-    def args2body(self, parsed_args):
-        body = {_NSD: {}}
-        nsd = None
-        if not parsed_args.nsd_file:
-            raise exceptions.InvalidInput(reason="Invalid input for nsd file")
-        with open(parsed_args.nsd_file) as f:
-            nsd = f.read()
-            try:
-                nsd = yaml.load(nsd, Loader=yaml.SafeLoader)
-            except yaml.YAMLError as e:
-                raise exceptions.InvalidInput(reason=e)
-            if not nsd:
-                raise exceptions.InvalidInput(reason="nsd file is empty")
-            body[_NSD]['attributes'] = {'nsd': nsd}
-        tackerV10.update_dict(parsed_args, body[_NSD],
-                              ['tenant_id', 'name', 'description'])
-        return body
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        nsd = client.create_nsd(self.args2body(parsed_args))
-        display_columns, columns = _get_columns(nsd[_NSD])
-        nsd[_NSD]['attributes']['nsd'] = yaml.load(
-            nsd[_NSD]['attributes']['nsd'])
-        data = utils.get_item_properties(
-            sdk_utils.DictModel(nsd[_NSD]),
-            columns, formatters=_formatters)
-        return (display_columns, data)
-
-
-class DeleteNSD(command.Command):
-    _description = _("Delete NSD(s).")
-
-    def get_parser(self, prog_name):
-        parser = super(DeleteNSD, self).get_parser(prog_name)
-        parser.add_argument(
-            _NSD,
-            metavar="<NSD>",
-            nargs="+",
-            help=_("NSD(s) to delete (name or ID)")
-        )
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        failure = False
-        deleted_ids = []
-        failed_items = {}
-        for resource_id in parsed_args.nsd:
-            try:
-                obj = tackerV10.find_resourceid_by_name_or_id(
-                    client, _NSD, resource_id)
-                client.delete_nsd(obj)
-                deleted_ids.append(resource_id)
-            except Exception as e:
-                failure = True
-                failed_items[resource_id] = e
-        if failure:
-            msg = ''
-            if deleted_ids:
-                msg = (_('Successfully deleted %(resource)s(s):'
-                         ' %(deleted_list)s') % {'deleted_list':
-                                                 ', '.join(deleted_ids),
-                                                 'resource': _NSD})
-            err_msg = _("\n\nUnable to delete the below"
-                        " %s(s):") % _NSD
-            for failed_id, error in failed_items.items():
-                err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s')
-                            % {'failed_id': failed_id,
-                               'error': error})
-            msg += err_msg
-            raise exceptions.CommandError(message=msg)
-        else:
-            print((_('All specified %(resource)s(s) deleted successfully')
-                   % {'resource': _NSD}))
-        return
-
-
-class ListNSD(command.Lister):
-    _description = ("List (NSD)s that belong to a given tenant.")
-
-    def get_parser(self, prog_name):
-        parser = super(ListNSD, self).get_parser(prog_name)
-        parser.add_argument(
-            '--template-source',
-            help=_("List NSD with specified template source. Available \
-                   options are 'onboared' (default), 'inline' or 'all'"),
-            action='store',
-            default='onboarded')
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        data = client.list_nsds()
-        headers, columns = tacker_osc_utils.get_column_definitions(
-            _attr_map, long_listing=None)
-        return (headers,
-                (utils.get_dict_properties(
-                    s, columns,
-                ) for s in data[_NSD + 's']))
-
-
-class ShowNSD(command.ShowOne):
-    _description = _("Display NSD details")
-
-    def get_parser(self, prog_name):
-        parser = super(ShowNSD, self).get_parser(prog_name)
-        parser.add_argument(
-            _NSD,
-            metavar="<NSD>",
-            help=_("NSD to display (name or ID)")
-        )
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        obj_id = tackerV10.find_resourceid_by_name_or_id(
-            client, _NSD, parsed_args.nsd)
-        obj = client.show_nsd(obj_id)
-        obj[_NSD]['attributes']['nsd'] = yaml.load(
-            obj[_NSD]['attributes']['nsd'])
-        display_columns, columns = _get_columns(obj[_NSD])
-        data = utils.get_item_properties(
-            sdk_utils.DictModel(obj[_NSD]),
-            columns,
-            formatters=_formatters)
-        return (display_columns, data)
-
-
-class ShowTemplateNSD(command.ShowOne):
-    _description = _("Display NSD Template details")
-
-    def get_parser(self, prog_name):
-        parser = super(ShowTemplateNSD, self).get_parser(prog_name)
-        parser.add_argument(
-            _NSD,
-            metavar="<NSD>",
-            help=_("NSD to display (name or ID)")
-        )
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        obj_id = tackerV10.find_resourceid_by_name_or_id(
-            client, _NSD, parsed_args.nsd)
-        obj = client.show_nsd(obj_id)
-        obj[_NSD]['attributes']['nsd'] = yaml.load(
-            obj[_NSD]['attributes']['nsd'])
-        data = utils.get_item_properties(
-            sdk_utils.DictModel(obj[_NSD]),
-            (u'attributes',),
-            formatters=_formatters)
-        data = (data or _('Unable to display NSD template!'))
-        return ((u'attributes',), data)

tackerclient/osc/v1/nfvo/vim.py

@@ -1,270 +0,0 @@
-# Copyright 2016 Brocade Communications Systems Inc
-# All Rights Reserved.
-#
-#
-#    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.
-
-import yaml
-
-from osc_lib.command import command
-from osc_lib import utils
-from oslo_utils import strutils
-
-from tackerclient.common import exceptions
-from tackerclient.i18n import _
-from tackerclient.osc import sdk_utils
-from tackerclient.osc import utils as tacker_osc_utils
-from tackerclient.tacker import v1_0 as tackerV10
-from tackerclient.tacker.v1_0.nfvo import vim_utils
-
-_attr_map = (
-    ('id', 'ID', tacker_osc_utils.LIST_BOTH),
-    ('name', 'Name', tacker_osc_utils.LIST_BOTH),
-    ('tenant_id', 'Tenant_id', tacker_osc_utils.LIST_BOTH),
-    ('type', 'Type', tacker_osc_utils.LIST_BOTH),
-    ('is_default', 'Is Default',
-     tacker_osc_utils.LIST_BOTH),
-    ('placement_attr', 'Placement attribution',
-     tacker_osc_utils.LIST_LONG_ONLY),
-    ('status', 'Status', tacker_osc_utils.LIST_BOTH),
-)
-
-_VIM = 'vim'
-
-
-class ListVIM(command.Lister):
-    _description = _("List VIMs that belong to a given tenant.")
-
-    def get_parser(self, prog_name):
-        parser = super(ListVIM, self).get_parser(prog_name)
-        parser.add_argument(
-            '--long',
-            action='store_true',
-            help=_("List additional fields in output")
-        )
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        data = client.list_vims()
-        headers, columns = tacker_osc_utils.get_column_definitions(
-            _attr_map, long_listing=parsed_args.long)
-        return (headers,
-                (utils.get_dict_properties(
-                    s, columns,
-                ) for s in data[_VIM + 's']))
-
-
-class ShowVIM(command.ShowOne):
-    _description = _("Display VIM details")
-
-    def get_parser(self, prog_name):
-        parser = super(ShowVIM, self).get_parser(prog_name)
-        parser.add_argument(
-            _VIM,
-            metavar="<VIM>",
-            help=_("VIM to display (name or ID)")
-        )
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        obj_id = tackerV10.find_resourceid_by_name_or_id(
-            client, _VIM, parsed_args.vim)
-        obj = client.show_vim(obj_id)
-        display_columns, columns = _get_columns(obj[_VIM])
-        data = utils.get_item_properties(
-            sdk_utils.DictModel(obj[_VIM]),
-            columns,
-            formatters=_formatters)
-        return (display_columns, data)
-
-
-class CreateVIM(command.ShowOne):
-    _description = _("Register a new VIM")
-
-    def get_parser(self, prog_name):
-        parser = super(CreateVIM, self).get_parser(prog_name)
-        parser.add_argument(
-            'name', metavar='NAME',
-            help=_('Set a name for the VIM'))
-        parser.add_argument(
-            '--tenant-id', metavar='TENANT_ID',
-            help=_('The owner tenant ID or project ID'))
-        parser.add_argument(
-            '--config-file',
-            required=True,
-            help=_('YAML file with VIM configuration parameters'))
-        parser.add_argument(
-            '--description',
-            help=_('Set a description for the VIM'))
-        parser.add_argument(
-            '--is-default',
-            action='store_true',
-            default=False,
-            help=_('Set as default VIM'))
-        return parser
-
-    def args2body(self, parsed_args):
-        body = {_VIM: {}}
-        if parsed_args.config_file:
-            with open(parsed_args.config_file) as f:
-                vim_config = f.read()
-                try:
-                    config_param = yaml.load(vim_config,
-                                             Loader=yaml.SafeLoader)
-                except yaml.YAMLError as e:
-                    raise exceptions.InvalidInput(reason=e)
-        vim_obj = body[_VIM]
-        try:
-            auth_url = config_param.pop('auth_url')
-        except KeyError:
-            raise exceptions.TackerClientException(message='Auth URL must be '
-                                                           'specified',
-                                                   status_code=404)
-        vim_obj['auth_url'] = vim_utils.validate_auth_url(auth_url).geturl()
-        vim_utils.args2body_vim(config_param, vim_obj)
-        tackerV10.update_dict(parsed_args, body[_VIM],
-                              ['tenant_id', 'name', 'description',
-                               'is_default'])
-        return body
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        vim = client.create_vim(self.args2body(parsed_args))
-        display_columns, columns = _get_columns(vim[_VIM])
-        data = utils.get_item_properties(
-            sdk_utils.DictModel(vim[_VIM]),
-            columns, formatters=_formatters)
-        return (display_columns, data)
-
-
-class DeleteVIM(command.Command):
-    _description = _("Delete VIM(s).")
-
-    def get_parser(self, prog_name):
-        parser = super(DeleteVIM, self).get_parser(prog_name)
-        parser.add_argument(
-            _VIM,
-            metavar="<VIM>",
-            nargs="+",
-            help=_("VIM(s) to delete (name or ID)")
-        )
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        failure = False
-        deleted_ids = []
-        failed_items = {}
-        for resource_id in parsed_args.vim:
-            try:
-                obj = tackerV10.find_resourceid_by_name_or_id(
-                    client, _VIM, resource_id)
-                client.delete_vim(obj)
-                deleted_ids.append(resource_id)
-            except Exception as e:
-                failure = True
-                failed_items[resource_id] = e
-        if failure:
-            msg = ''
-            if deleted_ids:
-                msg = (_('Successfully deleted %(resource)s(s):'
-                         ' %(deleted_list)s') % {'deleted_list':
-                                                 ', '.join(deleted_ids),
-                                                 'resource': _VIM})
-            err_msg = _("\n\nUnable to delete the below"
-                        " %s(s):") % _VIM
-            for failed_id, error in failed_items.items():
-                err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s')
-                            % {'failed_id': failed_id,
-                               'error': error})
-            msg += err_msg
-            raise exceptions.CommandError(message=msg)
-        else:
-            print((_('All specified %(resource)s(s) deleted successfully')
-                   % {'resource': _VIM}))
-        return
-
-
-class UpdateVIM(command.ShowOne):
-    _description = _("Update VIM.")
-
-    def get_parser(self, prog_name):
-        parser = super(UpdateVIM, self).get_parser(prog_name)
-        parser.add_argument(
-            'id', metavar="VIM",
-            help=_('ID or name of %s to update') % _VIM)
-        parser.add_argument(
-            '--config-file',
-            required=False,
-            help=_('YAML file with VIM configuration parameters'))
-        parser.add_argument(
-            '--name',
-            help=_('New name for the VIM'))
-        parser.add_argument(
-            '--description',
-            help=_('New description for the VIM'))
-        parser.add_argument(
-            '--is-default',
-            type=strutils.bool_from_string,
-            metavar='{True,False}',
-            help=_('Indicate whether the VIM is used as default'))
-        return parser
-
-    def args2body(self, parsed_args):
-        body = {_VIM: {}}
-        config_param = None
-        # config arg passed as data overrides config yaml when both args passed
-        if parsed_args.config_file:
-            with open(parsed_args.config_file) as f:
-                config_yaml = f.read()
-            try:
-                config_param = yaml.load(config_yaml)
-            except yaml.YAMLError as e:
-                raise exceptions.InvalidInput(reason=e)
-        vim_obj = body[_VIM]
-        if config_param is not None:
-            vim_utils.args2body_vim(config_param, vim_obj)
-        tackerV10.update_dict(parsed_args, body[_VIM],
-                              ['tenant_id', 'name', 'description',
-                               'is_default'])
-        # type attribute is read-only, it can't be updated, so remove it
-        # in update method
-        body[_VIM].pop('type', None)
-        return body
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        obj_id = tackerV10.find_resourceid_by_name_or_id(
-            client, _VIM, parsed_args.id)
-        vim = client.update_vim(obj_id, self.args2body(parsed_args))
-        display_columns, columns = _get_columns(vim[_VIM])
-        data = utils.get_item_properties(
-            sdk_utils.DictModel(vim[_VIM]), columns,
-            formatters=_formatters)
-        return (display_columns, data)
-
-
-_formatters = {
-    'auth_cred': tacker_osc_utils.format_dict_with_indention,
-    'placement_attr': tacker_osc_utils.format_dict_with_indention,
-    'vim_project': tacker_osc_utils.format_dict_with_indention,
-}
-
-
-def _get_columns(item):
-    column_map = {
-        'tenant_id': 'project_id',
-    }
-    return sdk_utils.get_osc_show_columns_for_sdk_resource(item, column_map)

tackerclient/osc/v1/nfvo/vnffg.py

@@ -1,548 +0,0 @@
-# Copyright 2018 OpenStack Foundation.
-# All Rights Reserved
-#
-#    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.
-#
-
-import yaml
-
-from osc_lib.command import command
-from osc_lib import utils
-
-from tackerclient.common import exceptions
-from tackerclient.i18n import _
-from tackerclient.osc import sdk_utils
-from tackerclient.osc import utils as tacker_osc_utils
-from tackerclient.tacker import v1_0 as tackerV10
-
-_VNFFG = 'vnffg'    # VNF Forwarding Graph
-_NFP = 'nfp'        # Network Forwarding Path
-_SFC = 'sfc'        # Service Function Chain
-_FC = 'classifier'  # Flow Classifier
-
-nfps_path = '/nfps'
-fcs_path = '/classifiers'
-sfcs_path = '/sfcs'
-
-DEFAULT_ERROR_REASON_LENGTH = 100
-
-_attr_map_vnffg = (
-    ('id', 'ID', tacker_osc_utils.LIST_BOTH),
-    ('name', 'Name', tacker_osc_utils.LIST_BOTH),
-    ('ns_id', 'NS ID', tacker_osc_utils.LIST_BOTH),
-    ('vnffgd_id', 'VNFFGD ID', tacker_osc_utils.LIST_BOTH),
-    ('status', 'Status', tacker_osc_utils.LIST_BOTH),
-    ('description', 'Description', tacker_osc_utils.LIST_LONG_ONLY),
-)
-
-_attr_map_nfp = (
-    ('id', 'ID', tacker_osc_utils.LIST_BOTH),
-    ('name', 'Name', tacker_osc_utils.LIST_BOTH),
-    ('status', 'Status', tacker_osc_utils.LIST_BOTH),
-    ('vnffg_id', 'VNFFG ID', tacker_osc_utils.LIST_BOTH),
-    ('path_id', 'Path ID', tacker_osc_utils.LIST_BOTH),
-)
-
-_attr_map_sfc = (
-    ('id', 'ID', tacker_osc_utils.LIST_BOTH),
-    ('status', 'Status', tacker_osc_utils.LIST_BOTH),
-    ('nfp_id', 'NFP ID', tacker_osc_utils.LIST_BOTH),
-)
-
-_attr_map_fc = (
-    ('id', 'ID', tacker_osc_utils.LIST_BOTH),
-    ('name', 'Name', tacker_osc_utils.LIST_BOTH),
-    ('status', 'Status', tacker_osc_utils.LIST_BOTH),
-    ('nfp_id', 'NFP ID', tacker_osc_utils.LIST_BOTH),
-    ('chain_id', 'Chain ID', tacker_osc_utils.LIST_BOTH),
-)
-
-_formatters = {
-    'attributes': tacker_osc_utils.format_dict_with_indention,
-    'match': tacker_osc_utils.format_dict_with_indention,
-    'chain': tacker_osc_utils.format_dict_with_indention,
-}
-
-
-def _get_columns(item):
-    column_map = {
-        'tenant_id': 'project_id',
-    }
-    return sdk_utils.get_osc_show_columns_for_sdk_resource(item, column_map)
-
-
-class CreateVNFFG(command.ShowOne):
-    _description = _("Create a new VNFFG.")
-
-    def get_parser(self, prog_name):
-        parser = super(CreateVNFFG, self).get_parser(prog_name)
-        parser.add_argument(
-            'name', metavar='NAME',
-            help=_('Set a name for the VNFFG'))
-        parser.add_argument(
-            '--tenant-id', metavar='TENANT_ID',
-            help=_('The owner tenant ID'))
-        vnffgd_group = parser.add_mutually_exclusive_group(required=True)
-        vnffgd_group.add_argument(
-            '--vnffgd-id',
-            help=_('VNFFGD ID to use as template to create VNFFG'))
-        vnffgd_group.add_argument(
-            '--vnffgd-name',
-            help=_('VNFFGD Name to use as template to create VNFFG'))
-        vnffgd_group.add_argument(
-            '--vnffgd-template',
-            help=_('VNFFGD file to create VNFFG'))
-        parser.add_argument(
-            '--vnf-mapping',
-            help=_('List of logical VNFD name to VNF instance name mapping. '
-                   'Example: VNF1:my_vnf1,VNF2:my_vnf2'))
-        parser.add_argument(
-            '--symmetrical',
-            action='store_true',
-            default=False,
-            help=_('Should a reverse path be created for the NFP '
-                   '(True or False)'))
-        parser.add_argument(
-            '--param-file',
-            help=_('YAML file with specific VNFFG parameters'))
-        parser.add_argument(
-            '--description',
-            help=_('Set a description for the VNFFG'))
-        return parser
-
-    def args2body(self, parsed_args):
-        body = {_VNFFG: {}}
-        body[_VNFFG]['attributes'] = {}
-
-        client = self.app.client_manager.tackerclient
-        if parsed_args.vnf_mapping:
-            _vnf_mapping = dict()
-            _vnf_mappings = parsed_args.vnf_mapping.split(",")
-            for mapping in _vnf_mappings:
-                vnfd_name, vnf = mapping.split(":", 1)
-                _vnf_mapping[vnfd_name] = \
-                    tackerV10.find_resourceid_by_name_or_id(
-                        client, 'vnf', vnf)
-            parsed_args.vnf_mapping = _vnf_mapping
-
-        if parsed_args.vnffgd_name:
-            _id = tackerV10.find_resourceid_by_name_or_id(
-                client, 'vnffgd', parsed_args.vnffgd_name)
-            parsed_args.vnffgd_id = _id
-        elif parsed_args.vnffgd_template:
-            with open(parsed_args.vnffgd_template) as f:
-                template = f.read()
-                try:
-                    template = yaml.load(template, Loader=yaml.SafeLoader)
-                except yaml.YAMLError as e:
-                    raise exceptions.InvalidInput(reason=e)
-                if not template:
-                    raise exceptions.InvalidInput(
-                        reason='The vnffgd file is empty')
-                body[_VNFFG]['vnffgd_template'] = template
-
-        if parsed_args.param_file:
-            with open(parsed_args.param_file) as f:
-                param_yaml = f.read()
-            try:
-                param_yaml = yaml.load(
-                    param_yaml, Loader=yaml.SafeLoader)
-            except yaml.YAMLError as e:
-                raise exceptions.InvalidInput(reason=e)
-            if not param_yaml:
-                raise exceptions.InvalidInput(
-                    reason='The parameter file is empty')
-            body[_VNFFG]['attributes'] = {'param_values': param_yaml}
-        tackerV10.update_dict(parsed_args, body[_VNFFG],
-                              ['tenant_id', 'name', 'vnffgd_id',
-                               'symmetrical', 'vnf_mapping', 'description'])
-        return body
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        vnffg = client.create_vnffg(self.args2body(parsed_args))
-        display_columns, columns = _get_columns(vnffg[_VNFFG])
-        data = utils.get_item_properties(
-            sdk_utils.DictModel(vnffg[_VNFFG]),
-            columns,
-            formatters=_formatters)
-        return (display_columns, data)
-
-
-class DeleteVNFFG(command.Command):
-    _description = _("Delete VNFFG(s).")
-
-    def get_parser(self, prog_name):
-        parser = super(DeleteVNFFG, self).get_parser(prog_name)
-        parser.add_argument(
-            _VNFFG,
-            metavar="<VNFFG>",
-            nargs="+",
-            help=_("VNFFG(s) to delete (name or ID)")
-        )
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        failure = False
-        deleted_ids = []
-        failed_items = {}
-        for resource_id in parsed_args.vnffg:
-            try:
-                obj = tackerV10.find_resourceid_by_name_or_id(
-                    client, _VNFFG, resource_id)
-                client.delete_vnffg(obj)
-                deleted_ids.append(resource_id)
-            except Exception as e:
-                failure = True
-                failed_items[resource_id] = e
-        if failure:
-            msg = ''
-            if deleted_ids:
-                msg = (_('Successfully deleted %(resource)s(s):'
-                         ' %(deleted_list)s') % {'deleted_list':
-                                                 ', '.join(deleted_ids),
-                                                 'resource': _VNFFG})
-            err_msg = _("\n\nUnable to delete the below"
-                        " %s(s):") % _VNFFG
-            for failed_id, error in failed_items.items():
-                err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s')
-                            % {'failed_id': failed_id,
-                               'error': error})
-            msg += err_msg
-            raise exceptions.CommandError(message=msg)
-        else:
-            print((_('All specified %(resource)s(s) deleted successfully')
-                   % {'resource': _VNFFG}))
-        return
-
-
-class UpdateVNFFG(command.ShowOne):
-    _description = _("Update VNFFG.")
-
-    def get_parser(self, prog_name):
-        parser = super(UpdateVNFFG, self).get_parser(prog_name)
-        parser.add_argument(
-            _VNFFG,
-            metavar="<VNFFG>",
-            help=_('VNFFG to update (name or ID)'))
-        parser.add_argument(
-            '--vnffgd-template',
-            help=_('VNFFGD file to update VNFFG'))
-        parser.add_argument(
-            '--vnf-mapping',
-            help=_('List of logical VNFD name to VNF instance name mapping.  '
-                   'Example: VNF1:my_vnf1,VNF2:my_vnf2'))
-        parser.add_argument(
-            '--symmetrical',
-            action='store_true',
-            default=False,
-            help=_('Should a reverse path be created for the NFP'))
-        parser.add_argument(
-            '--description',
-            help=_('Set a description for the VNFFG'))
-        parser.add_argument(
-            '--param-file',
-            help=_('YAML file with specific VNFFG parameters'))
-        return parser
-
-    def args2body(self, parsed_args):
-        body = {_VNFFG: {}}
-        body[_VNFFG]['attributes'] = {}
-
-        client = self.app.client_manager.tackerclient
-
-        if parsed_args.vnf_mapping:
-            _vnf_mapping = dict()
-            _vnf_mappings = parsed_args.vnf_mapping.split(",")
-            for mapping in _vnf_mappings:
-                vnfd_name, vnf = mapping.split(":", 1)
-                _vnf_mapping[vnfd_name] = \
-                    tackerV10.find_resourceid_by_name_or_id(
-                        client, 'vnf', vnf)
-            parsed_args.vnf_mapping = _vnf_mapping
-
-        if parsed_args.vnffgd_template:
-            with open(parsed_args.vnffgd_template) as f:
-                template = f.read()
-                try:
-                    template = yaml.load(
-                        template, Loader=yaml.SafeLoader)
-                except yaml.YAMLError as e:
-                    raise exceptions.InvalidInput(reason=e)
-                if not template:
-                    raise exceptions.InvalidInput(
-                        reason='The vnffgd file is empty')
-                body[_VNFFG]['vnffgd_template'] = template
-
-        if parsed_args.param_file:
-            with open(parsed_args.param_file) as f:
-                param_yaml = f.read()
-            try:
-                param_yaml = yaml.load(
-                    param_yaml, Loader=yaml.SafeLoader)
-            except yaml.YAMLError as e:
-                raise exceptions.InvalidInput(reason=e)
-            if not param_yaml:
-                raise exceptions.InvalidInput(
-                    reason='The parameter file is empty')
-            body[_VNFFG]['attributes'] = {'param_values': param_yaml}
-        tackerV10.update_dict(parsed_args, body[_VNFFG],
-                              ['vnf_mapping', 'symmetrical', 'description'])
-        return body
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        obj_id = tackerV10.find_resourceid_by_name_or_id(
-            client, _VNFFG, parsed_args.vnffg)
-        vnffg = client.update_vnffg(obj_id, self.args2body(parsed_args))
-        display_columns, columns = _get_columns(vnffg[_VNFFG])
-        data = utils.get_item_properties(
-            sdk_utils.DictModel(vnffg[_VNFFG]),
-            columns,
-            formatters=_formatters)
-        return (display_columns, data)
-
-
-class ListVNFFG(command.Lister):
-    _description = ("List VNFFG(s) that belong to a given tenant.")
-
-    def get_parser(self, prog_name):
-        parser = super(ListVNFFG, self).get_parser(prog_name)
-        parser.add_argument(
-            '--long',
-            action='store_true',
-            help=_('List additional fields in output')
-        )
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        data = client.list_vnffgs()
-        headers, columns = tacker_osc_utils.get_column_definitions(
-            _attr_map_vnffg, long_listing=parsed_args.long)
-        return (headers,
-                (utils.get_dict_properties(
-                    s, columns,
-                ) for s in data[_VNFFG + 's']))
-
-
-class ShowVNFFG(command.ShowOne):
-    _description = _("Display VNFFG details")
-
-    def get_parser(self, prog_name):
-        parser = super(ShowVNFFG, self).get_parser(prog_name)
-        parser.add_argument(
-            _VNFFG,
-            metavar="<VNFFG>",
-            help=_('VNFFG to display (name or ID)')
-        )
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        obj_id = tackerV10.find_resourceid_by_name_or_id(
-            client, _VNFFG, parsed_args.vnffg)
-        obj = client.show_vnffg(obj_id)
-        display_columns, columns = _get_columns(obj[_VNFFG])
-        data = utils.get_item_properties(
-            sdk_utils.DictModel(obj[_VNFFG]),
-            columns,
-            formatters=_formatters)
-        return (display_columns, data)
-
-
-class ListNFP(command.Lister):
-    _description = ("List NFP(s) that belong to a given tenant.")
-
-    def get_parser(self, prog_name):
-        parser = super(ListNFP, self).get_parser(prog_name)
-        parser.add_argument(
-            '--vnffg-id',
-            help=_('List NFP(s) with specific VNFFG ID'))
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        _params = {}
-        if parsed_args.vnffg_id:
-            _params['vnffg_id'] = parsed_args.vnffg_id
-        nfps = client.list('nfps', nfps_path, True, **_params)
-        for nfp in nfps['nfps']:
-            error_reason = nfp.get('error_reason', None)
-            if error_reason and \
-                    len(error_reason) > DEFAULT_ERROR_REASON_LENGTH:
-                nfp['error_reason'] = error_reason[
-                    :DEFAULT_ERROR_REASON_LENGTH]
-                nfp['error_reason'] += '...'
-        data = {}
-        data['nfps'] = nfps['nfps']
-        data = client.list_nfps()
-        headers, columns = tacker_osc_utils.get_column_definitions(
-            _attr_map_nfp, long_listing=None)
-        return (headers,
-                (utils.get_dict_properties(
-                    s, columns,
-                ) for s in data[_NFP + 's']))
-
-
-class ShowNFP(command.ShowOne):
-    _description = _("Display NFP details")
-
-    def get_parser(self, prog_name):
-        parser = super(ShowNFP, self).get_parser(prog_name)
-        parser.add_argument(
-            _NFP,
-            metavar="<NFP>",
-            help=_('NFP to display (name or ID)')
-        )
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        obj_id = tackerV10.find_resourceid_by_name_or_id(
-            client, _NFP, parsed_args.nfp)
-        obj = client.show_nfp(obj_id)
-        display_columns, columns = _get_columns(obj[_NFP])
-        data = utils.get_item_properties(
-            sdk_utils.DictModel(obj[_NFP]),
-            columns)
-        return (display_columns, data)
-
-
-class ListFC(command.Lister):
-    _description = ("List flow classifier(s) that belong to a given tenant.")
-
-    def get_parser(self, prog_name):
-        parser = super(ListFC, self).get_parser(prog_name)
-        parser.add_argument(
-            '--nfp-id',
-            help=_('List flow classifier(s) with specific nfp id'))
-        parser.add_argument(
-            '--tenant-id', metavar='TENANT_ID',
-            help=_('The owner tenant ID or project ID'))
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        _params = {}
-        if parsed_args.nfp_id:
-            _params['nfp_id'] = parsed_args.nfp_id
-        if parsed_args.tenant_id:
-            _params['tenant_id'] = parsed_args.tenant_id
-        classifiers = client.list('classifiers', fcs_path, True,
-                                  **_params)
-        for classifier in classifiers['classifiers']:
-            error_reason = classifier.get('error_reason', None)
-            if error_reason and \
-                    len(error_reason) > DEFAULT_ERROR_REASON_LENGTH:
-                classifier['error_reason'] = error_reason[
-                    :DEFAULT_ERROR_REASON_LENGTH]
-                classifier['error_reason'] += '...'
-        data = {}
-        data['classifiers'] = classifiers['classifiers']
-        data = client.list_classifiers()
-        headers, columns = tacker_osc_utils.get_column_definitions(
-            _attr_map_fc, long_listing=None)
-        return (headers,
-                (utils.get_dict_properties(
-                    s, columns,
-                ) for s in data[_FC + 's']))
-
-
-class ShowFC(command.ShowOne):
-    _description = _("Display flow classifier details")
-
-    def get_parser(self, prog_name):
-        parser = super(ShowFC, self).get_parser(prog_name)
-        parser.add_argument(
-            _FC,
-            metavar="<Classifier ID>",
-            help=_('Flow Classifier to display (name or ID)')
-        )
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        obj_id = tackerV10.find_resourceid_by_name_or_id(
-            client, _FC, parsed_args.classifier)
-        obj = client.show_classifier(obj_id)
-        display_columns, columns = _get_columns(obj[_FC])
-        data = utils.get_item_properties(
-            sdk_utils.DictModel(obj[_FC]),
-            columns,
-            formatters=_formatters)
-        return (display_columns, data)
-
-
-class ListSFC(command.Lister):
-    _description = ("List SFC(s) that belong to a given tenant.")
-
-    def get_parser(self, prog_name):
-        parser = super(ListSFC, self).get_parser(prog_name)
-        parser.add_argument(
-            '--nfp-id',
-            help=_('List SFC(s) with specific nfp id'))
-        parser.add_argument(
-            '--tenant-id', metavar='TENANT_ID',
-            help=_('The owner tenant ID or project ID'))
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        _params = {}
-        if parsed_args.nfp_id:
-            _params['nfp_id'] = parsed_args.nfp_id
-        if parsed_args.tenant_id:
-            _params['tenant_id'] = parsed_args.tenant_id
-        sfcs = client.list('sfcs', sfcs_path, True, **_params)
-        for chain in sfcs['sfcs']:
-            error_reason = chain.get('error_reason', None)
-            if error_reason and \
-                    len(error_reason) > DEFAULT_ERROR_REASON_LENGTH:
-                chain['error_reason'] = error_reason[
-                    :DEFAULT_ERROR_REASON_LENGTH]
-                chain['error_reason'] += '...'
-        data = {}
-        data['sfcs'] = sfcs['sfcs']
-        headers, columns = tacker_osc_utils.get_column_definitions(
-            _attr_map_sfc, long_listing=None)
-        return (headers,
-                (utils.get_dict_properties(
-                    s, columns,
-                ) for s in data[_SFC + 's']))
-
-
-class ShowSFC(command.ShowOne):
-    _description = _("Display SFC details")
-
-    def get_parser(self, prog_name):
-        parser = super(ShowSFC, self).get_parser(prog_name)
-        parser.add_argument(
-            _SFC,
-            metavar="<SFC>",
-            help=_('SFC to display (name or ID)')
-        )
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        obj_id = tackerV10.find_resourceid_by_name_or_id(
-            client, _SFC, parsed_args.sfc)
-        obj = client.show_sfc(obj_id)
-        display_columns, columns = _get_columns(obj[_SFC])
-        data = utils.get_item_properties(
-            sdk_utils.DictModel(obj[_SFC]),
-            columns,
-            formatters=_formatters)
-        return (display_columns, data)

tackerclient/osc/v1/nfvo/vnffgd.py

@@ -1,217 +0,0 @@
-# Copyright 2018 OpenStack Foundation.
-# All Rights Reserved
-#
-#    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.
-#
-
-import yaml
-
-from osc_lib.command import command
-from osc_lib import utils
-
-from tackerclient.common import exceptions
-from tackerclient.i18n import _
-from tackerclient.osc import sdk_utils
-from tackerclient.osc import utils as tacker_osc_utils
-from tackerclient.tacker import v1_0 as tackerV10
-
-_attr_map = (
-    ('id', 'ID', tacker_osc_utils.LIST_BOTH),
-    ('name', 'Name', tacker_osc_utils.LIST_BOTH),
-    ('template_source', 'Template_Source',
-     tacker_osc_utils.LIST_BOTH),
-    ('description', 'Description', tacker_osc_utils.LIST_BOTH),
-)
-
-_VNFFGD = "vnffgd"
-
-_formatters = {
-    'template': tacker_osc_utils.format_dict_with_indention,
-}
-
-
-def _get_columns(item):
-    column_map = {
-        'tenant_id': 'project_id',
-    }
-    return sdk_utils.get_osc_show_columns_for_sdk_resource(item, column_map)
-
-
-class CreateVNFFGD(command.ShowOne):
-    _description = _("Create a new VNFFGD")
-
-    def get_parser(self, prog_name):
-        parser = super(CreateVNFFGD, self).get_parser(prog_name)
-        parser.add_argument(
-            'name', metavar='NAME',
-            help=_('Name for VNFFGD'))
-        parser.add_argument(
-            '--tenant-id', metavar='TENANT_ID',
-            help=_('The owner tenant ID or project ID'))
-        parser.add_argument(
-            '--vnffgd-file',
-            required=True,
-            help=_('YAML file with VNFFGD parameters'))
-        parser.add_argument(
-            '--description',
-            help=_('Set a description for the VNFFGD'))
-        return parser
-
-    def args2body(self, parsed_args):
-        body = {_VNFFGD: {}}
-        vnffgd = None
-        if not parsed_args.vnffgd_file:
-            raise exceptions.InvalidInput(
-                reason="Invalid input for vnffgd file")
-        with open(parsed_args.vnffgd_file) as f:
-            vnffgd = f.read()
-            try:
-                vnffgd = yaml.load(vnffgd, Loader=yaml.SafeLoader)
-            except yaml.YAMLError as e:
-                raise exceptions.InvalidInput(reason=e)
-            if not vnffgd:
-                raise exceptions.InvalidInput(reason="vnffgd file is empty")
-            body[_VNFFGD]['template'] = {'vnffgd': vnffgd}
-        tackerV10.update_dict(parsed_args, body[_VNFFGD],
-                              ['tenant_id', 'name', 'description'])
-        return body
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        vnffgd = client.create_vnffgd(self.args2body(parsed_args))
-        display_columns, columns = _get_columns(vnffgd[_VNFFGD])
-        data = utils.get_item_properties(
-            sdk_utils.DictModel(vnffgd[_VNFFGD]),
-            columns, formatters=_formatters)
-        return (display_columns, data)
-
-
-class DeleteVNFFGD(command.Command):
-    _description = _("Delete VNFFGD(s).")
-
-    def get_parser(self, prog_name):
-        parser = super(DeleteVNFFGD, self).get_parser(prog_name)
-        parser.add_argument(
-            _VNFFGD,
-            metavar="<VNFFGD>",
-            nargs="+",
-            help=_("VNFFGD(s) to delete (name or ID)")
-        )
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        failure = False
-        deleted_ids = []
-        failed_items = {}
-        for resource_id in parsed_args.vnffgd:
-            try:
-                obj = tackerV10.find_resourceid_by_name_or_id(
-                    client, _VNFFGD, resource_id)
-                client.delete_vnffgd(obj)
-                deleted_ids.append(resource_id)
-            except Exception as e:
-                failure = True
-                failed_items[resource_id] = e
-        if failure:
-            msg = ''
-            if deleted_ids:
-                msg = (_('Successfully deleted %(resource)s(s):'
-                         ' %(deleted_list)s') % {'deleted_list':
-                                                 ', '.join(deleted_ids),
-                                                 'resource': _VNFFGD})
-            err_msg = _("\n\nUnable to delete the below"
-                        " %s(s):") % _VNFFGD
-            for failed_id, error in failed_items.items():
-                err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s')
-                            % {'failed_id': failed_id,
-                               'error': error})
-            msg += err_msg
-            raise exceptions.CommandError(message=msg)
-        else:
-            print((_('All specified %(resource)s(s) deleted successfully')
-                   % {'resource': _VNFFGD}))
-        return
-
-
-class ListVNFFGD(command.Lister):
-    _description = ("List (VNFFGD)s that belong to a given tenant.")
-
-    def get_parser(self, prog_name):
-        parser = super(ListVNFFGD, self).get_parser(prog_name)
-        parser.add_argument(
-            '--template-source',
-            help=_("List VNFFGD with specified template source. Available \
-                   options are 'onboarded' (default), 'inline' or 'all'"),
-            action='store',
-            default='onboarded')
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        data = client.list_vnffgds()
-        headers, columns = tacker_osc_utils.get_column_definitions(
-            _attr_map, long_listing=None)
-        return (headers,
-                (utils.get_dict_properties(
-                    s, columns,
-                ) for s in data[_VNFFGD + 's']))
-
-
-class ShowVNFFGD(command.ShowOne):
-    _description = _("Display VNFFGD details")
-
-    def get_parser(self, prog_name):
-        parser = super(ShowVNFFGD, self).get_parser(prog_name)
-        parser.add_argument(
-            _VNFFGD,
-            metavar="<VNFFGD>",
-            help=_("VNFFGD to display (name or ID)")
-        )
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        obj_id = tackerV10.find_resourceid_by_name_or_id(
-            client, _VNFFGD, parsed_args.vnffgd)
-        obj = client.show_vnffgd(obj_id)
-        display_columns, columns = _get_columns(obj[_VNFFGD])
-        data = utils.get_item_properties(
-            sdk_utils.DictModel(obj[_VNFFGD]),
-            columns, formatters=_formatters)
-        return (display_columns, data)
-
-
-class ShowTemplateVNFFGD(command.ShowOne):
-    _description = _("Display VNFFGD Template details")
-
-    def get_parser(self, prog_name):
-        parser = super(ShowTemplateVNFFGD, self).get_parser(prog_name)
-        parser.add_argument(
-            _VNFFGD,
-            metavar="<VNFFGD>",
-            help=_("VNFFGD to display (name or ID)")
-        )
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        obj_id = tackerV10.find_resourceid_by_name_or_id(
-            client, _VNFFGD, parsed_args.vnffgd)
-        obj = client.show_vnffgd(obj_id)
-        data = utils.get_item_properties(
-            sdk_utils.DictModel(obj[_VNFFGD]),
-            (u'template',),
-            formatters=_formatters)
-        data = (data or _('Unable to display VNFFGD template!'))
-        return ((u'template',), data)

tackerclient/osc/v1/vnflcm/samples/instantiate_vnf_instance_param_sample.json

@@ -1,79 +0,0 @@
-{
-   "flavourId":"simple",
-   "instantiationLevelId":"instantiation_level_1",
-   "extVirtualLinks":[
-      {
-         "id":"ext-vl-uuid-VL1",
-         "vimConnectionId":"vim-uuid",
-         "resourceProviderId":"resource-provider-id",
-         "resourceId":"neutron-network-uuid_VL1",
-         "extCps":[
-            {
-               "cpdId":"CP1",
-               "cpConfig":[
-                  {
-                     "cpInstanceId":"cp-instance-id",
-                     "linkPortId":"link-port-uuid_CP1",
-                     "cpProtocolData":[
-                        {
-                           "layerProtocol":"IP_OVER_ETHERNET",
-                           "ipOverEthernet":{
-                              "macAddress":"00:25:96:FF:FE:12:34:56",
-                              "ipAddresses":[
-                                 {
-                                    "addressRange":{
-                                       "minAddress":"192.168.11.01",
-                                       "maxAddress":"192.168.21.201"
-                                    },
-                                    "subnetId":"neutron-subnet-uuid_CP1"
-                                 }
-                              ]
-                           }
-                        }
-                     ]
-                  }
-               ]
-            }
-         ],
-         "extLinkPorts":[
-            {
-               "id":"link-port-uuid_CP1",
-               "resourceHandle":{
-                  "vimConnectionId":"vim-uuid",
-                  "resourceProviderId":"resource-provider-id",
-                  "resourceId":"neutron-port-uuid_CP1",
-                  "vimLevelResourceType":"LINKPORT"
-               }
-            }
-         ]
-      }
-   ],
-   "extManagedVirtualLinks":[
-      {
-         "id":"extMngVLnk-uuid_VL3",
-         "vnfVirtualLinkDescId":"VL3",
-         "vimConnectionId":"vim-uuid",
-         "resourceProviderId":"resource-provider-id",
-         "resourceId":"neutron-network-uuid_VL3"
-      }
-   ],
-   "vimConnectionInfo":[
-      {
-         "id":"vim-uuid",
-         "vimId":"dummy-vimid",
-         "vimType":"ETSINFV.OPENSTACK_KEYSTONE.v_2",
-         "interfaceInfo":{
-            "key1":"value1",
-            "key2":"value2"
-         },
-         "accessInfo":{
-            "key1":"value1",
-            "key2":"value2"
-         },
-         "extra":{
-            "key1":"value1",
-            "key2":"value2"
-         }
-      }
-   ]
-}

tackerclient/osc/v1/vnflcm/samples/scale_vnf_instance_param_sample.json

@@ -1,3 +0,0 @@
-{
-    "additionalParams": {"key1":"value1", "key2":"value2"}
-}

tackerclient/osc/v1/vnflcm/samples/update_vnf_instance_param_sample.json

@@ -1,5 +0,0 @@
-{
-    "vnfInstanceName": "sample",
-    "vnfInstanceDescription" : "sample_description",
-    "vnfdId" : "sample_id"
-  }

tackerclient/osc/v1/vnflcm/vnflcm.py

@@ -1,535 +0,0 @@
-# Copyright (C) 2020 NTT DATA
-# All Rights Reserved.
-#
-#    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.
-
-import json
-import logging
-import os
-import time
-
-from osc_lib.command import command
-from osc_lib import utils
-
-from tackerclient.common import exceptions
-from tackerclient.i18n import _
-from tackerclient.osc import sdk_utils
-from tackerclient.osc import utils as tacker_osc_utils
-
-_attr_map = (
-    ('id', 'ID', tacker_osc_utils.LIST_BOTH),
-    ('vnfInstanceName', 'VNF Instance Name', tacker_osc_utils.LIST_BOTH),
-    ('instantiationState', 'Instantiation State', tacker_osc_utils.LIST_BOTH),
-    ('vnfProvider', 'VNF Provider', tacker_osc_utils.LIST_BOTH),
-    ('vnfSoftwareVersion', 'VNF Software Version', tacker_osc_utils.LIST_BOTH),
-    ('vnfProductName', 'VNF Product Name', tacker_osc_utils.LIST_BOTH),
-    ('vnfdId', 'VNFD ID', tacker_osc_utils.LIST_BOTH)
-)
-
-LOG = logging.getLogger(__name__)
-
-_mixed_case_fields = ('vnfInstanceName', 'vnfInstanceDescription', 'vnfdId',
-                      'vnfProvider', 'vnfProductName', 'vnfSoftwareVersion',
-                      'vnfdVersion', 'instantiationState',
-                      'vimConnectionInfo', 'instantiatedVnfInfo')
-
-_VNF_INSTANCE = 'vnf_instance'
-
-VNF_INSTANCE_TERMINATION_TIMEOUT = 300
-
-EXTRA_WAITING_TIME = 10
-
-SLEEP_TIME = 1
-
-formatters = {'vimConnectionInfo': tacker_osc_utils.FormatComplexDataColumn,
-              'instantiatedVnfInfo': tacker_osc_utils.FormatComplexDataColumn,
-              '_links': tacker_osc_utils.FormatComplexDataColumn}
-
-
-def _get_columns(vnflcm_obj, action=None):
-    column_map = {
-        'id': 'ID',
-        'vnfInstanceName': 'VNF Instance Name',
-        'vnfInstanceDescription': 'VNF Instance Description',
-        'vnfdId': 'VNFD ID',
-        'vnfProvider': 'VNF Provider',
-        'vnfProductName': 'VNF Product Name',
-        'vnfSoftwareVersion': 'VNF Software Version',
-        'vnfdVersion': 'VNFD Version',
-        'instantiationState': 'Instantiation State',
-        '_links': 'Links',
-    }
-    if action == 'show':
-        if vnflcm_obj['instantiationState'] == 'INSTANTIATED':
-            column_map.update(
-                {'instantiatedVnfInfo': 'Instantiated Vnf Info'}
-            )
-        column_map.update(
-            {'vimConnectionInfo': 'VIM Connection Info',
-             '_links': 'Links'}
-        )
-    return sdk_utils.get_osc_show_columns_for_sdk_resource(vnflcm_obj,
-                                                           column_map)
-
-
-class CreateVnfLcm(command.ShowOne):
-    _description = _("Create a new VNF Instance")
-
-    def get_parser(self, prog_name):
-        parser = super(CreateVnfLcm, self).get_parser(prog_name)
-        parser.add_argument(
-            'vnfd_id',
-            metavar="<vnfd-id>",
-            help=_('Identifier that identifies the VNFD which defines the '
-                   'VNF instance to be created.'))
-        parser.add_argument(
-            '--name',
-            metavar="<vnf-instance-name>",
-            help=_('Name of the VNF instance to be created.'))
-        parser.add_argument(
-            '--description',
-            metavar="<vnf-instance-description>",
-            help=_('Description of the VNF instance to be created.'))
-        parser.add_argument(
-            '--I',
-            metavar="<param-file>",
-            help=_("Instantiate VNF subsequently after it's creation. "
-                   "Specify instantiate request parameters in a json file."))
-        return parser
-
-    def args2body(self, parsed_args, file_path=None):
-        body = {}
-
-        if file_path:
-            return jsonfile2body(file_path)
-
-        body['vnfdId'] = parsed_args.vnfd_id
-
-        if parsed_args.description:
-            body['vnfInstanceDescription'] = parsed_args.description
-
-        if parsed_args.name:
-            body['vnfInstanceName'] = parsed_args.name
-
-        return body
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        vnf = client.create_vnf_instance(self.args2body(parsed_args))
-        if parsed_args.I:
-            # Instantiate VNF instance.
-            result = client.instantiate_vnf_instance(
-                vnf['id'],
-                self.args2body(parsed_args, file_path=parsed_args.I))
-            if not result:
-                print((_('VNF Instance %(id)s is created and instantiation'
-                         ' request has been accepted.') % {'id': vnf['id']}))
-        display_columns, columns = _get_columns(vnf)
-        data = utils.get_item_properties(sdk_utils.DictModel(vnf),
-                                         columns, formatters=formatters,
-                                         mixed_case_fields=_mixed_case_fields)
-        return (display_columns, data)
-
-
-class ShowVnfLcm(command.ShowOne):
-    _description = _("Display VNF instance details")
-
-    def get_parser(self, prog_name):
-        parser = super(ShowVnfLcm, self).get_parser(prog_name)
-        parser.add_argument(
-            _VNF_INSTANCE,
-            metavar="<vnf-instance>",
-            help=_("VNF instance ID to display"))
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        obj = client.show_vnf_instance(parsed_args.vnf_instance)
-        display_columns, columns = _get_columns(obj, action='show')
-        data = utils.get_item_properties(
-            sdk_utils.DictModel(obj),
-            columns, mixed_case_fields=_mixed_case_fields,
-            formatters=formatters)
-        return (display_columns, data)
-
-
-class ListVnfLcm(command.Lister):
-    _description = _("List VNF Instance")
-
-    def get_parser(self, prog_name):
-        parser = super(ListVnfLcm, self).get_parser(prog_name)
-        return parser
-
-    def take_action(self, parsed_args):
-        _params = {}
-        client = self.app.client_manager.tackerclient
-        vnf_instances = client.list_vnf_instances(**_params)
-        headers, columns = tacker_osc_utils.get_column_definitions(
-            _attr_map, long_listing=True)
-        return (headers,
-                (utils.get_dict_properties(
-                    s, columns, mixed_case_fields=_mixed_case_fields,
-                ) for s in vnf_instances))
-
-
-def jsonfile2body(file_path):
-
-    if file_path is not None and os.access(file_path, os.R_OK) is False:
-        msg = _("File %s does not exist or user does not have read "
-                "privileges to it")
-        reason = msg % file_path
-        raise exceptions.InvalidInput(reason=reason)
-
-    try:
-        with open(file_path) as f:
-            body = json.load(f)
-    except (IOError, ValueError) as ex:
-        msg = _("Failed to load parameter file. Error: %s")
-        reason = msg % ex
-        raise exceptions.InvalidInput(reason=reason)
-
-    if not body:
-        reason = _('The parameter file is empty')
-        raise exceptions.InvalidInput(reason=reason)
-
-    return body
-
-
-class InstantiateVnfLcm(command.Command):
-    _description = _("Instantiate a VNF Instance")
-
-    def get_parser(self, prog_name):
-        parser = super(InstantiateVnfLcm, self).get_parser(prog_name)
-        parser.add_argument(
-            _VNF_INSTANCE,
-            metavar="<vnf-instance>",
-            help=_("VNF instance ID to instantiate"))
-        parser.add_argument(
-            'instantiation_request_file',
-            metavar="<param-file>",
-            help=_('Specify instantiate request parameters in a json file.'))
-
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        result = client.instantiate_vnf_instance(
-            parsed_args.vnf_instance, jsonfile2body(
-                parsed_args.instantiation_request_file))
-        if not result:
-            print((_('Instantiate request for VNF Instance %(id)s has been'
-                     ' accepted.') % {'id': parsed_args.vnf_instance}))
-
-
-class HealVnfLcm(command.Command):
-    _description = _("Heal VNF Instance")
-
-    def get_parser(self, prog_name):
-        parser = super(HealVnfLcm, self).get_parser(prog_name)
-        parser.add_argument(
-            _VNF_INSTANCE,
-            metavar="<vnf-instance>",
-            help=_("VNF instance ID to heal"))
-        parser.add_argument(
-            '--cause',
-            help=_('Specify the reason why a healing procedure is required.'))
-        parser.add_argument(
-            '--vnfc-instance',
-            metavar="<vnfc-instance-id>",
-            nargs="+",
-            help=_("List of VNFC instances requiring a healing action.")
-        )
-        return parser
-
-    def args2body(self, parsed_args):
-        body = {}
-        if parsed_args.cause:
-            body['cause'] = parsed_args.cause
-        if parsed_args.vnfc_instance:
-            body['vnfcInstanceId'] = parsed_args.vnfc_instance
-
-        return body
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        result = client.heal_vnf_instance(
-            parsed_args.vnf_instance, self.args2body(parsed_args))
-        if not result:
-            print((_('Heal request for VNF Instance %(id)s has been'
-                     ' accepted.') % {'id': parsed_args.vnf_instance}))
-
-
-class TerminateVnfLcm(command.Command):
-    _description = _("Terminate a VNF instance")
-
-    def get_parser(self, prog_name):
-        parser = super(TerminateVnfLcm, self).get_parser(prog_name)
-        parser.add_argument(
-            _VNF_INSTANCE,
-            metavar="<vnf-instance>",
-            help=_("VNF instance ID to terminate"))
-        parser.add_argument(
-            "--termination-type",
-            default='GRACEFUL',
-            metavar="<termination-type>",
-            choices=['GRACEFUL', 'FORCEFUL'],
-            help=_("Termination type can be 'GRACEFUL' or 'FORCEFUL'. "
-                   "Default is 'GRACEFUL'"))
-        parser.add_argument(
-            '--graceful-termination-timeout',
-            metavar="<graceful-termination-timeout>",
-            type=int,
-            help=_('This attribute is only applicable in case of graceful '
-                   'termination. It defines the time to wait for the VNF to be'
-                   ' taken out of service before shutting down the VNF and '
-                   'releasing the resources. The unit is seconds.'))
-        parser.add_argument(
-            '--D',
-            action='store_true',
-            default=False,
-            help=_("Delete VNF Instance subsequently after it's termination"),
-        )
-        return parser
-
-    def args2body(self, parsed_args):
-        body = {}
-        body['terminationType'] = parsed_args.termination_type
-
-        if parsed_args.graceful_termination_timeout:
-            if parsed_args.termination_type == 'FORCEFUL':
-                exceptions.InvalidInput(reason='--graceful-termination-timeout'
-                                        ' argument is invalid for "FORCEFUL"'
-                                        ' termination')
-            body['gracefulTerminationTimeout'] = parsed_args.\
-                graceful_termination_timeout
-
-        return body
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        result = client.terminate_vnf_instance(parsed_args.vnf_instance,
-                                               self.args2body(parsed_args))
-        if not result:
-            print(_("Terminate request for VNF Instance '%(id)s' has been"
-                  " accepted.") % {'id': parsed_args.vnf_instance})
-            if parsed_args.D:
-                print(_("Waiting for vnf instance to be terminated before "
-                      "deleting"))
-
-                self._wait_until_vnf_is_terminated(
-                    client, parsed_args.vnf_instance,
-                    graceful_timeout=parsed_args.graceful_termination_timeout)
-
-                result = client.delete_vnf_instance(parsed_args.vnf_instance)
-                if not result:
-                    print(_("VNF Instance '%(id)s' deleted successfully") %
-                          {'id': parsed_args.vnf_instance})
-
-    def _wait_until_vnf_is_terminated(self, client, vnf_instance_id,
-                                      graceful_timeout=None):
-        # wait until vnf instance 'instantiationState' is set to
-        # 'NOT_INSTANTIATED'
-        if graceful_timeout:
-            # If graceful_termination_timeout is provided,
-            # terminate vnf will start after this timeout period.
-            # Hence, it should wait for extra time of 10 seconds
-            # after this graceful_termination_timeout period.
-            timeout = graceful_timeout + EXTRA_WAITING_TIME
-        else:
-            timeout = VNF_INSTANCE_TERMINATION_TIMEOUT
-
-        start_time = int(time.time())
-        while True:
-            vnf_instance = client.show_vnf_instance(vnf_instance_id)
-            if vnf_instance['instantiationState'] == 'NOT_INSTANTIATED':
-                break
-
-            if ((int(time.time()) - start_time) > timeout):
-                msg = _("Couldn't verify vnf instance is terminated within "
-                        "'%(timeout)s' seconds. Unable to delete vnf instance "
-                        "%(id)s")
-                raise exceptions.CommandError(
-                    message=msg % {'timeout': timeout, 'id': vnf_instance_id})
-            time.sleep(SLEEP_TIME)
-
-
-class DeleteVnfLcm(command.Command):
-    """Vnf lcm delete
-
-    DeleteVnfLcm class supports bulk deletion of vnf instances, and error
-    handling.
-    """
-
-    _description = _("Delete VNF Instance(s)")
-
-    def get_parser(self, prog_name):
-        parser = super(DeleteVnfLcm, self).get_parser(prog_name)
-        parser.add_argument(
-            'vnf_instances',
-            metavar="<vnf-instance>",
-            nargs="+",
-            help=_("VNF instance ID(s) to delete"))
-        return parser
-
-    def take_action(self, parsed_args):
-        error_count = 0
-        client = self.app.client_manager.tackerclient
-        vnf_instances = parsed_args.vnf_instances
-        for vnf_instance in vnf_instances:
-            try:
-                client.delete_vnf_instance(vnf_instance)
-            except Exception as e:
-                error_count += 1
-                LOG.error(_("Failed to delete vnf instance with "
-                            "ID '%(vnf)s': %(e)s"),
-                          {'vnf': vnf_instance, 'e': e})
-
-        total = len(vnf_instances)
-        if (error_count > 0):
-            msg = (_("Failed to delete %(error_count)s of %(total)s "
-                     "vnf instances.") % {'error_count': error_count,
-                                          'total': total})
-            raise exceptions.CommandError(message=msg)
-        else:
-            if total > 1:
-                print(_('All specified vnf instances are deleted '
-                        'successfully'))
-            else:
-                print(_("Vnf instance '%s' deleted "
-                        "successfully") % vnf_instances[0])
-
-
-class UpdateVnfLcm(command.Command):
-    _description = _("Update VNF Instance")
-
-    def get_parser(self, prog_name):
-        """Add arguments to parser.
-
-        Args:
-            prog_name ([string]): program name
-
-        Returns:
-            parser([ArgumentParser]): [description]
-        """
-        parser = super(UpdateVnfLcm, self).get_parser(prog_name)
-        parser.add_argument(
-            _VNF_INSTANCE,
-            metavar="<vnf-instance>",
-            help=_('VNF instance ID to update.'))
-        parser.add_argument(
-            '--I',
-            metavar="<param-file>",
-            help=_("Specify update request parameters in a json file."))
-
-        return parser
-
-    def args2body(self, file_path=None):
-        """Call jsonfile2body to store request body to body(dict)
-
-        Args:
-            file_path ([string], optional): file path of param file(json).
-                                             Defaults to None.
-
-        Returns:
-            body ([dict]): Request body is stored
-        """
-        body = {}
-
-        if file_path:
-            return jsonfile2body(file_path)
-
-        return body
-
-    def take_action(self, parsed_args):
-        """Execute update_vnf_instance and output result comment
-
-        Args:
-            parsed_args ([Namespace]): [description]
-        """
-        client = self.app.client_manager.tackerclient
-        if parsed_args.I:
-            # Update VNF instance.
-            result = client.update_vnf_instance(
-                parsed_args.vnf_instance,
-                self.args2body(file_path=parsed_args.I))
-            if not result:
-                print((_('Update vnf:%(id)s ') %
-                       {'id': parsed_args.vnf_instance}))
-
-
-class ScaleVnfLcm(command.Command):
-    _description = _("Scale a VNF Instance")
-
-    def get_parser(self, prog_name):
-        parser = super(ScaleVnfLcm, self).get_parser(prog_name)
-        parser.add_argument(
-            _VNF_INSTANCE,
-            metavar="<vnf-instance>",
-            help=_('VNF instance ID to scale'))
-        parser.add_argument(
-            '--I',
-            metavar="<param-file>",
-            help=_("Specify scale request parameters in a json file."))
-        parser.add_argument(
-            '--type',
-            metavar="<type>",
-            choices=['SCALE_OUT', 'SCALE_IN'],
-            help=_("Indicates the type of the scale operation requested"))
-        parser.add_argument(
-            '--aspect-id',
-            metavar="<aspect-id>",
-            help=_("Identifier of the scaling aspect."))
-        parser.add_argument(
-            '--number-of-steps',
-            metavar="<number-of-steps>",
-            type=int,
-            help=_("Number of scaling steps to be executed as part of"
-                   "this Scale VNF operation."))
-        parser.add_argument(
-            '--additional-param-file',
-            metavar="<additional-param-file>",
-            help=_("Additional parameters passed by the NFVO as input"
-                   "to the scaling process."))
-        return parser
-
-    def args2body(self, file_path=None):
-        """To store request body, call jsonfile2body.
-
-        Args:
-            file_path ([string], optional): file path of param file(json).
-            Defaults to None.
-
-        Returns:
-            body[dict]: [description]
-        """
-        body = {}
-
-        if file_path:
-            return jsonfile2body(file_path)
-
-        return body
-
-    def take_action(self, parsed_args):
-        """Execute scale_vnf_instance and output result comment.
-
-        Args:
-            parsed_args ([Namespace]): [description]
-        """
-        client = self.app.client_manager.tackerclient
-        if parsed_args.additional_param_file:
-            result = client.scale_vnf_instance(
-                parsed_args.vnf_instance,
-                self.args2body(file_path=parsed_args.additional_param_file))
-            if not result:
-                print((_('Scale request for VNF Instance %(id)s has been'
-                         ' accepted.') % {'id': parsed_args.vnf_instance}))

tackerclient/osc/v1/vnflcm/vnflcm_op_occs.py

@@ -1,45 +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.
-
-from osc_lib.command import command
-from tackerclient.i18n import _
-
-
-class RollbackVnfLcmOp(command.Command):
-    def get_parser(self, prog_name):
-        """Add arguments to parser.
-
-        Args:
-            prog_name ([type]): program name
-
-        Returns:
-            parser([ArgumentParser]):
-        """
-        parser = super(RollbackVnfLcmOp, self).get_parser(prog_name)
-        parser.add_argument(
-            'vnf_lcm_op_occ_id',
-            metavar="<vnf-lcm-op-occ-id>",
-            help=_('VNF lifecycle management operation occurrence ID.'))
-
-        return parser
-
-    def take_action(self, parsed_args):
-        """Execute rollback_vnf_instance and output comment.
-
-        Args:
-            parsed_args ([Namespace]): arguments of CLI.
-        """
-        client = self.app.client_manager.tackerclient
-        result = client.rollback_vnf_instance(parsed_args.vnf_lcm_op_occ_id)
-        if not result:
-            print((_('Rollback request for LCM operation %(id)s has been'
-                     ' accepted') % {'id': parsed_args.vnf_lcm_op_occ_id}))

tackerclient/osc/v1/vnfm/vnf.py

@@ -1,464 +0,0 @@
-# Copyright 2018 OpenStack Foundation.
-# All Rights Reserved
-#
-#    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.
-#
-
-import yaml
-
-from osc_lib.command import command
-from osc_lib import utils
-from oslo_utils import encodeutils
-
-from tackerclient.common import exceptions
-from tackerclient.i18n import _
-from tackerclient.osc import sdk_utils
-from tackerclient.osc import utils as tacker_osc_utils
-from tackerclient.tacker import v1_0 as tackerV10
-
-_attr_map = (
-    ('id', 'ID', tacker_osc_utils.LIST_BOTH),
-    ('name', 'Name', tacker_osc_utils.LIST_BOTH),
-    ('mgmt_ip_address', 'Mgmt Ip Address',
-     tacker_osc_utils.LIST_BOTH),
-    ('status', 'Status', tacker_osc_utils.LIST_BOTH),
-    ('vim_id', 'VIM ID', tacker_osc_utils.LIST_BOTH),
-    ('vnfd_id', 'VNFD ID', tacker_osc_utils.LIST_BOTH),
-    ('tenant_id', 'Project ID', tacker_osc_utils.LIST_LONG_ONLY),
-)
-
-_attr_map_rsc = (
-    ('id', 'ID', tacker_osc_utils.LIST_BOTH),
-    ('name', 'Name', tacker_osc_utils.LIST_BOTH),
-    ('type', 'Type', tacker_osc_utils.LIST_BOTH),
-)
-
-_VNF = "vnf"
-
-
-def _get_columns(item):
-    column_map = {
-        'tenant_id': 'project_id',
-    }
-    return sdk_utils.get_osc_show_columns_for_sdk_resource(item, column_map)
-
-
-def _break_string(vnf_monitoring_policy):
-    count_space = 0
-    monitoring_policy = "\n"
-    for i in range(0, len(vnf_monitoring_policy)):
-        monitoring_policy += vnf_monitoring_policy[i]
-        if vnf_monitoring_policy[i] == ' ':
-            count_space += 1
-        if count_space == 9:
-            monitoring_policy += "\n"
-            count_space = 0
-    return monitoring_policy
-
-
-class CreateVNF(command.ShowOne):
-    _description = _("Create a new VNF")
-
-    def get_parser(self, prog_name):
-        parser = super(CreateVNF, self).get_parser(prog_name)
-        parser.add_argument(
-            'name', metavar='NAME',
-            help=_('Set a name for the VNF'))
-        parser.add_argument(
-            '--tenant-id', metavar='TENANT_ID',
-            help=_('The owner tenant ID or project ID'))
-        vnfd_group = parser.add_mutually_exclusive_group(required=True)
-        vnfd_group.add_argument(
-            '--vnfd-id',
-            help=_('VNFD ID to use as template to create VNF'))
-        vnfd_group.add_argument(
-            '--vnfd-name',
-            help=_('VNFD Name to use as template to create VNF'))
-        vnfd_group.add_argument(
-            '--vnfd-template',
-            help=_("VNFD file to create VNF"))
-        vim_group = parser.add_mutually_exclusive_group()
-        vim_group.add_argument(
-            '--vim-id',
-            help=_('VIM ID to deploy VNF on specified VIM'))
-        vim_group.add_argument(
-            '--vim-name',
-            help=_('VIM name to deploy VNF on specified VIM'))
-        parser.add_argument(
-            '--vim-region-name',
-            help=_('VIM Region to deploy VNF on specified VIM'))
-        parser.add_argument(
-            '--config-file',
-            help=_('YAML file with VNF configuration'))
-        parser.add_argument(
-            '--param-file',
-            help=_('Specify parameter yaml file'))
-        parser.add_argument(
-            '--description',
-            help=_('Set description for the VNF'))
-        return parser
-
-    def args2body(self, parsed_args):
-        body = {_VNF: {}}
-        body[_VNF]['attributes'] = {}
-
-        config = None
-        if parsed_args.config_file:
-            with open(parsed_args.config_file) as f:
-                config_yaml = f.read()
-            try:
-                config = yaml.load(
-                    config_yaml, Loader=yaml.SafeLoader)
-            except yaml.YAMLError as e:
-                raise exceptions.InvalidInput(reason=e)
-        if config:
-            body[_VNF]['attributes'] = {'config': config}
-
-        if parsed_args.vim_region_name:
-            body[_VNF].setdefault('placement_attr', {})['region_name'] = \
-                parsed_args.vim_region_name
-
-        client = self.app.client_manager.tackerclient
-        if parsed_args.vim_name:
-            _id = tackerV10.find_resourceid_by_name_or_id(client, 'vim',
-                                                          parsed_args.vim_name)
-            parsed_args.vim_id = _id
-        if parsed_args.vnfd_name:
-            _id = tackerV10.find_resourceid_by_name_or_id(
-                client, 'vnfd',
-                parsed_args.vnfd_name
-            )
-            parsed_args.vnfd_id = _id
-        elif parsed_args.vnfd_template:
-            with open(parsed_args.vnfd_template) as f:
-                template = f.read()
-                try:
-                    template = yaml.load(
-                        template, Loader=yaml.SafeLoader)
-                except yaml.YAMLError as e:
-                    raise exceptions.InvalidInput(reason=e)
-                if not template:
-                    raise exceptions.InvalidInput(
-                        reason='The vnfd file is empty')
-                body[_VNF]['vnfd_template'] = template
-
-        if parsed_args.param_file:
-            with open(parsed_args.param_file) as f:
-                param_yaml = f.read()
-            try:
-                param_yaml = yaml.load(
-                    param_yaml, Loader=yaml.SafeLoader)
-            except yaml.YAMLError as e:
-                raise exceptions.InvalidInput(reason=e)
-            if not param_yaml:
-                raise exceptions.InvalidInput(
-                    reason='The parameter file is empty')
-            body[_VNF]['attributes'] = {'param_values': param_yaml}
-        tackerV10.update_dict(parsed_args, body[_VNF],
-                              ['tenant_id', 'name', 'description',
-                               'vnfd_id', 'vim_id'])
-        return body
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        vnf = client.create_vnf(self.args2body(parsed_args))
-        display_columns, columns = _get_columns(vnf[_VNF])
-        if vnf[_VNF]['attributes'].get('monitoring_policy'):
-            vnf[_VNF]['attributes']['monitoring_policy'] =\
-                _break_string(vnf[_VNF]['attributes']['monitoring_policy'])
-        data = utils.get_item_properties(
-            sdk_utils.DictModel(vnf[_VNF]),
-            columns)
-        return (display_columns, data)
-
-
-class DeleteVNF(command.Command):
-    _description = _("Delete VNF(s).")
-
-    def get_parser(self, prog_name):
-        parser = super(DeleteVNF, self).get_parser(prog_name)
-        parser.add_argument(
-            _VNF,
-            metavar="<VNF>",
-            nargs="+",
-            help=_("VNF(s) to delete (name or ID)"))
-        parser.add_argument(
-            '--force',
-            default=False,
-            action='store_true',
-            help=_('Force delete VNF instance'))
-        return parser
-
-    def args2body(self, parsed_args):
-        body = dict()
-        if parsed_args.force:
-            body[_VNF] = dict()
-            body[_VNF]['attributes'] = dict()
-            body[_VNF]['attributes']['force'] = True
-        return body
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        failure = False
-        deleted_ids = []
-        failed_items = {}
-        body = self.args2body(parsed_args)
-        for resource_id in parsed_args.vnf:
-            try:
-                obj = tackerV10.find_resourceid_by_name_or_id(
-                    client, _VNF, resource_id)
-                client.delete_vnf(obj, body)
-                deleted_ids.append(resource_id)
-            except Exception as e:
-                failure = True
-                failed_items[resource_id] = e
-        if failure:
-            msg = ''
-            if deleted_ids:
-                msg = (_('Successfully deleted %(resource)s(s):'
-                         ' %(deleted_list)s') % {'deleted_list':
-                                                 ', '.join(deleted_ids),
-                                                 'resource': _VNF})
-            err_msg = _("\n\nUnable to delete the below"
-                        " %s(s):") % _VNF
-            for failed_id, error in failed_items.items():
-                err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s')
-                            % {'failed_id': failed_id,
-                               'error': error})
-            msg += err_msg
-            raise exceptions.CommandError(message=msg)
-        else:
-            print((_('All specified %(resource)s(s) deleted successfully')
-                   % {'resource': _VNF}))
-        return
-
-
-class ListVNF(command.Lister):
-    _description = _("List VNF(s) that belong to a given tenant.")
-
-    def get_parser(self, prog_name):
-        parser = super(ListVNF, self).get_parser(prog_name)
-        parser.add_argument(
-            '--template-source',
-            help=_("List VNF with specified template source. Available \
-                   options are 'onboarded' (default), 'inline' or 'all'"),
-            action='store',
-            default='onboarded')
-        vim_group = parser.add_mutually_exclusive_group()
-        vim_group.add_argument(
-            '--vim-id',
-            help=_('List VNF(s) that belong to a given VIM ID'))
-        vim_group.add_argument(
-            '--vim-name',
-            help=_('List VNF(s) that belong to a given VIM Name'))
-        vnfd_group = parser.add_mutually_exclusive_group()
-        vnfd_group.add_argument(
-            '--vnfd-id',
-            help=_('List VNF(s) that belong to a given VNFD ID'))
-        vnfd_group.add_argument(
-            '--vnfd-name',
-            help=_('List VNF(s) that belong to a given VNFD Name'))
-        parser.add_argument(
-            '--tenant-id', metavar='TENANT_ID',
-            help=_('The owner tenant ID or project ID'))
-        parser.add_argument(
-            '--long',
-            action='store_true',
-            help=_('List additional fields in output'))
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        _params = {}
-        if parsed_args.vim_id:
-            _params['vim_id'] = parsed_args.vim_id
-        if parsed_args.vim_name:
-            vim_id = tackerV10.find_resourceid_by_name_or_id(
-                client, 'vim', parsed_args.vim_name
-            )
-            _params['vim_id'] = vim_id
-        if parsed_args.vnfd_id:
-            _params['vnfd_id'] = parsed_args.vnfd_id
-        if parsed_args.vnfd_name:
-            vim_id = tackerV10.find_resourceid_by_name_or_id(
-                client, 'vnfd', parsed_args.vnfd_name
-            )
-            _params['vnfd_id'] = vim_id
-        if parsed_args.tenant_id:
-            _params['tenant_id'] = parsed_args.tenant_id
-        data = client.list_vnfs(**_params)
-        headers, columns = tacker_osc_utils.get_column_definitions(
-            _attr_map, long_listing=parsed_args.long)
-        return (headers,
-                (utils.get_dict_properties(
-                    s, columns,
-                ) for s in data[_VNF + 's']))
-
-
-class ShowVNF(command.ShowOne):
-    _description = _("Display VNF details")
-
-    def get_parser(self, prog_name):
-        parser = super(ShowVNF, self).get_parser(prog_name)
-        parser.add_argument(
-            _VNF,
-            metavar="<VNF>",
-            help=_("VNF to display (name or ID)"))
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        obj_id = tackerV10.find_resourceid_by_name_or_id(
-            client, _VNF, parsed_args.vnf)
-        obj = client.show_vnf(obj_id)
-        if obj[_VNF]['attributes'].get('monitoring_policy'):
-            obj[_VNF]['attributes']['monitoring_policy'] =\
-                _break_string(obj[_VNF]['attributes']['monitoring_policy'])
-        display_columns, columns = _get_columns(obj[_VNF])
-        data = utils.get_item_properties(
-            sdk_utils.DictModel(obj[_VNF]),
-            columns)
-        return (display_columns, data)
-
-
-class ListVNFResources(command.Lister):
-    _description = _("List resources of a VNF like VDU, CP, etc.")
-
-    def get_parser(self, prog_name):
-        parser = super(ListVNFResources, self).get_parser(prog_name)
-        parser.add_argument(
-            _VNF,
-            metavar="<VNF>",
-            help=_("VNF to display (name or ID)"))
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        obj_id = tackerV10.find_resourceid_by_name_or_id(
-            client, _VNF, parsed_args.vnf)
-        data = client.list_vnf_resources(obj_id)
-        headers, columns = tacker_osc_utils.get_column_definitions(
-            _attr_map_rsc, long_listing=None)
-        return (headers,
-                (utils.get_dict_properties(
-                    s, columns,
-                ) for s in data['resources']))
-
-
-class UpdateVNF(command.ShowOne):
-    _description = _("Update a given VNF.")
-
-    def get_parser(self, prog_name):
-        parser = super(UpdateVNF, self).get_parser(prog_name)
-        group = parser.add_mutually_exclusive_group(required=True)
-        group.add_argument(
-            '--config-file',
-            help=_('YAML file with VNF configuration'))
-        group.add_argument(
-            '--config',
-            help=_('YAML data with VNF configuration'))
-        group.add_argument(
-            '--param-file',
-            help=_('YAML file with VNF parameter'))
-        parser.add_argument(
-            _VNF,
-            metavar="<VNF>",
-            help=_("VNF to update (name or ID)"))
-        return parser
-
-    def args2body(self, parsed_args):
-        body = {_VNF: {}}
-        body[_VNF]['attributes'] = {}
-
-        config = None
-        if parsed_args.config_file:
-            with open(parsed_args.config_file) as f:
-                config_yaml = f.read()
-            try:
-                config = yaml.load(config_yaml, Loader=yaml.SafeLoader)
-            except yaml.YAMLError as e:
-                raise exceptions.InvalidInput(reason=e)
-            if not config:
-                raise exceptions.InvalidInput(
-                    reason='The config file is empty')
-        if parsed_args.config:
-            decoded_config = encodeutils.safe_decode(parsed_args.config)
-            try:
-                config = yaml.load(decoded_config, Loader=yaml.SafeLoader)
-            except yaml.YAMLError as e:
-                raise exceptions.InvalidInput(reason=e)
-            if not config:
-                raise exceptions.InvalidInput(
-                    reason='The parameter is empty')
-        if config:
-            body[_VNF]['attributes'] = {'config': config}
-        if parsed_args.param_file:
-            with open(parsed_args.param_file) as f:
-                param_yaml = f.read()
-            try:
-                param = yaml.load(
-                    param_yaml, Loader=yaml.SafeLoader)
-            except yaml.YAMLError as e:
-                raise exceptions.InvalidInput(reason=e)
-            if not param:
-                raise exceptions.InvalidInput(
-                    reason='The parameter file is empty')
-            body[_VNF]['attributes'] = {'param_values': param}
-        tackerV10.update_dict(parsed_args, body[_VNF], ['tenant_id'])
-        return body
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        obj_id = tackerV10.find_resourceid_by_name_or_id(
-            client, _VNF, parsed_args.vnf)
-        vnf = client.update_vnf(obj_id, self.args2body(parsed_args))
-        if vnf[_VNF]['attributes'].get('monitoring_policy'):
-            vnf[_VNF]['attributes']['monitoring_policy'] =\
-                _break_string(vnf[_VNF]['attributes']['monitoring_policy'])
-        display_columns, columns = _get_columns(vnf[_VNF])
-        data = utils.get_item_properties(
-            sdk_utils.DictModel(vnf[_VNF]),
-            columns)
-        return (display_columns, data)
-
-
-class ScaleVNF(command.Command):
-    _description = _("Scale a VNF.")
-
-    def get_parser(self, prog_name):
-        parser = super(ScaleVNF, self).get_parser(prog_name)
-        parser.add_argument(
-            '--scaling-policy-name',
-            help=_('VNF policy name used to scale'))
-        parser.add_argument(
-            '--scaling-type',
-            help=_('VNF scaling type, it could be either "out" or "in"'))
-        parser.add_argument(
-            _VNF,
-            metavar="<VNF>",
-            help=_("VNF to scale (name or ID)"))
-        return parser
-
-    def args2body(self, parsed_args):
-        args = {}
-        body = {"scale": args}
-        args['type'] = parsed_args.scaling_type
-        args['policy'] = parsed_args.scaling_policy_name
-        return body
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        obj_id = tackerV10.find_resourceid_by_name_or_id(
-            client, _VNF, parsed_args.vnf)
-        client.scale_vnf(obj_id, self.args2body(parsed_args))
-        return

tackerclient/osc/v1/vnfm/vnfd.py

@@ -1,224 +0,0 @@
-# Copyright 2016 NEC Corporation.
-# All Rights Reserved
-#
-#    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.
-#
-
-import yaml
-
-from osc_lib.command import command
-from osc_lib import utils
-
-from tackerclient.common import exceptions
-from tackerclient.i18n import _
-from tackerclient.osc import sdk_utils
-from tackerclient.osc import utils as tacker_osc_utils
-from tackerclient.tacker import v1_0 as tackerV10
-
-_attr_map = (
-    ('id', 'ID', tacker_osc_utils.LIST_BOTH),
-    ('name', 'Name', tacker_osc_utils.LIST_BOTH),
-    ('template_source', 'Template_Source',
-     tacker_osc_utils.LIST_BOTH),
-    ('description', 'Description', tacker_osc_utils.LIST_BOTH),
-)
-
-_VNFD = "vnfd"
-
-_formatters = {
-    'attributes': tacker_osc_utils.format_dict_with_indention,
-}
-
-
-def _get_columns(item):
-    column_map = {
-        'tenant_id': 'project_id',
-    }
-    return sdk_utils.get_osc_show_columns_for_sdk_resource(item, column_map)
-
-
-class CreateVNFD(command.ShowOne):
-    _description = _("Create a new VNFD")
-
-    def get_parser(self, prog_name):
-        parser = super(CreateVNFD, self).get_parser(prog_name)
-        parser.add_argument(
-            'name', metavar='NAME',
-            help=_('Name for VNFD'))
-        parser.add_argument(
-            '--tenant-id', metavar='TENANT_ID',
-            help=_('The owner tenant ID or project ID'))
-        parser.add_argument(
-            '--vnfd-file',
-            required=True,
-            help=_('YAML file with VNFD parameters'))
-        parser.add_argument(
-            '--description',
-            help=_('Set a description for the VNFD'))
-        return parser
-
-    def args2body(self, parsed_args):
-        body = {_VNFD: {}}
-        vnfd = None
-        if not parsed_args.vnfd_file:
-            raise exceptions.InvalidInput(reason="Invalid input for vnfd file")
-        with open(parsed_args.vnfd_file) as f:
-            vnfd = f.read()
-            try:
-                vnfd = yaml.load(vnfd, Loader=yaml.SafeLoader)
-            except yaml.YAMLError as e:
-                msg = _("yaml failed to load vnfd file. %s") % e
-                raise exceptions.InvalidInput(reason=msg)
-            if not vnfd:
-                raise exceptions.InvalidInput(reason="vnfd file is empty")
-            body[_VNFD]['attributes'] = {'vnfd': vnfd}
-        tackerV10.update_dict(parsed_args, body[_VNFD],
-                              ['tenant_id', 'name', 'description'])
-        return body
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        vnfd = client.create_vnfd(self.args2body(parsed_args))
-        display_columns, columns = _get_columns(vnfd[_VNFD])
-        vnfd[_VNFD]['attributes']['vnfd'] = yaml.load(
-            vnfd[_VNFD]['attributes']['vnfd'])
-        data = utils.get_item_properties(
-            sdk_utils.DictModel(vnfd[_VNFD]),
-            columns, formatters=_formatters)
-        return (display_columns, data)
-
-
-class DeleteVNFD(command.Command):
-    _description = _("Delete VNFD(s).")
-
-    def get_parser(self, prog_name):
-        parser = super(DeleteVNFD, self).get_parser(prog_name)
-        parser.add_argument(
-            _VNFD,
-            metavar="<VNFD>",
-            nargs="+",
-            help=_("VNFD(s) to delete (name or ID)")
-        )
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        failure = False
-        deleted_ids = []
-        failed_items = {}
-        for resource_id in parsed_args.vnfd:
-            try:
-                obj = tackerV10.find_resourceid_by_name_or_id(
-                    client, _VNFD, resource_id)
-                client.delete_vnfd(obj)
-                deleted_ids.append(resource_id)
-            except Exception as e:
-                failure = True
-                failed_items[resource_id] = e
-        if failure:
-            msg = ''
-            if deleted_ids:
-                msg = (_('Successfully deleted %(resource)s(s):'
-                         ' %(deleted_list)s') % {'deleted_list':
-                                                 ', '.join(deleted_ids),
-                                                 'resource': _VNFD})
-            err_msg = _("\n\nUnable to delete the below"
-                        " %s(s):") % _VNFD
-            for failed_id, error in failed_items.items():
-                err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s')
-                            % {'failed_id': failed_id,
-                               'error': error})
-            msg += err_msg
-            raise exceptions.CommandError(message=msg)
-        else:
-            print((_('All specified %(resource)s(s) deleted successfully')
-                   % {'resource': _VNFD}))
-        return
-
-
-class ListVNFD(command.Lister):
-    _description = ("List (VNFD)s that belong to a given tenant.")
-
-    def get_parser(self, prog_name):
-        parser = super(ListVNFD, self).get_parser(prog_name)
-        parser.add_argument(
-            '--template-source',
-            help=_("List VNFD with specified template source. Available \
-                   options are 'onboarded' (default), 'inline' or 'all'"),
-            action='store',
-            default='onboarded')
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        data = client.list_vnfds()
-        headers, columns = tacker_osc_utils.get_column_definitions(
-            _attr_map, long_listing=None)
-        return (headers,
-                (utils.get_dict_properties(
-                    s, columns,
-                ) for s in data[_VNFD + 's']))
-
-
-class ShowVNFD(command.ShowOne):
-    _description = _("Display VNFD details")
-
-    def get_parser(self, prog_name):
-        parser = super(ShowVNFD, self).get_parser(prog_name)
-        parser.add_argument(
-            _VNFD,
-            metavar="<VNFD>",
-            help=_("VNFD to display (name or ID)")
-        )
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        obj_id = tackerV10.find_resourceid_by_name_or_id(
-            client, _VNFD, parsed_args.vnfd)
-        obj = client.show_vnfd(obj_id)
-        obj[_VNFD]['attributes']['vnfd'] = yaml.load(
-            obj[_VNFD]['attributes']['vnfd'])
-        display_columns, columns = _get_columns(obj[_VNFD])
-        data = utils.get_item_properties(
-            sdk_utils.DictModel(obj[_VNFD]),
-            columns,
-            formatters=_formatters)
-        return (display_columns, data)
-
-
-class ShowTemplateVNFD(command.ShowOne):
-    _description = _("Display VNFD Template details")
-
-    def get_parser(self, prog_name):
-        parser = super(ShowTemplateVNFD, self).get_parser(prog_name)
-        parser.add_argument(
-            _VNFD,
-            metavar="<VNFD>",
-            help=_("VNFD to display (name or ID)")
-        )
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        obj_id = tackerV10.find_resourceid_by_name_or_id(
-            client, _VNFD, parsed_args.vnfd)
-        obj = client.show_vnfd(obj_id)
-        obj[_VNFD]['attributes']['vnfd'] = yaml.load(
-            obj[_VNFD]['attributes']['vnfd'])
-        data = utils.get_item_properties(
-            sdk_utils.DictModel(obj[_VNFD]),
-            (u'attributes',),
-            formatters=_formatters)
-        data = (data or _('Unable to display VNFD template!'))
-        return ((u'attributes',), data)

tackerclient/osc/v1/vnfpkgm/vnf_package.py

@@ -1,522 +0,0 @@
-# Copyright (C) 2019 NTT DATA
-# All Rights Reserved.
-#
-#    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.
-
-from functools import reduce
-import logging
-import sys
-
-from osc_lib.cli import parseractions
-from osc_lib.command import command
-from osc_lib import utils
-
-from tackerclient.common import exceptions
-from tackerclient.i18n import _
-from tackerclient.osc import sdk_utils
-from tackerclient.osc import utils as tacker_osc_utils
-
-LOG = logging.getLogger(__name__)
-
-
-formatters = {'softwareImages': tacker_osc_utils.FormatComplexDataColumn,
-              'checksum': tacker_osc_utils.FormatComplexDataColumn,
-              '_links': tacker_osc_utils.FormatComplexDataColumn,
-              'userDefinedData': tacker_osc_utils.FormatComplexDataColumn,
-              'additionalArtifacts': tacker_osc_utils.FormatComplexDataColumn}
-
-
-_mixed_case_fields = ('usageState', 'onboardingState', 'operationalState',
-                      'vnfProductName', 'softwareImages', 'userDefinedData',
-                      'vnfdId', 'vnfdVersion', 'vnfSoftwareVersion',
-                      'vnfProvider', 'additionalArtifacts')
-
-
-def _get_columns(vnf_package_obj):
-    column_map = {
-        '_links': 'Links',
-        'onboardingState': 'Onboarding State',
-        'operationalState': 'Operational State',
-        'usageState': 'Usage State',
-        'userDefinedData': 'User Defined Data',
-        'id': 'ID'
-    }
-
-    if vnf_package_obj['onboardingState'] == 'ONBOARDED':
-        column_map.update({
-            'softwareImages': 'Software Images',
-            'vnfProvider': 'VNF Provider',
-            'vnfSoftwareVersion': 'VNF Software Version',
-            'vnfProductName': 'VNF Product Name',
-            'vnfdId': 'VNFD ID',
-            'vnfdVersion': 'VNFD Version',
-            'checksum': 'Checksum',
-            'additionalArtifacts': 'Additional Artifacts'
-        })
-
-    return sdk_utils.get_osc_show_columns_for_sdk_resource(vnf_package_obj,
-                                                           column_map)
-
-
-class CreateVnfPackage(command.ShowOne):
-    _description = _("Create a new VNF Package")
-
-    def get_parser(self, prog_name):
-        LOG.debug('get_parser(%s)', prog_name)
-        parser = super(CreateVnfPackage, self).get_parser(prog_name)
-        parser.add_argument(
-            '--user-data',
-            metavar='<key=value>',
-            action=parseractions.KeyValueAction,
-            help=_('User defined data for the VNF package '
-                   '(repeat option to set multiple user defined data)'),
-        )
-        return parser
-
-    def args2body(self, parsed_args):
-        body = {}
-        if parsed_args.user_data:
-            body["userDefinedData"] = parsed_args.user_data
-        return body
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        vnf_package = client.create_vnf_package(self.args2body(parsed_args))
-        display_columns, columns = _get_columns(vnf_package)
-        data = utils.get_item_properties(
-            sdk_utils.DictModel(vnf_package),
-            columns, formatters=formatters,
-            mixed_case_fields=_mixed_case_fields)
-        return (display_columns, data)
-
-
-class ListVnfPackage(command.Lister):
-    _description = _("List VNF Packages")
-
-    def get_parser(self, prog_name):
-        LOG.debug('get_parser(%s)', prog_name)
-        parser = super(ListVnfPackage, self).get_parser(prog_name)
-        parser.add_argument(
-            "--filter",
-            metavar="<filter>",
-            help=_("Atrribute-based-filtering parameters"),
-        )
-        fields_exclusive_group = parser.add_mutually_exclusive_group(
-            required=False)
-        fields_exclusive_group.add_argument(
-            "--all_fields",
-            action="store_true",
-            default=False,
-            help=_("Include all complex attributes in the response"),
-        )
-        fields_exclusive_group.add_argument(
-            "--fields",
-            metavar="fields",
-            help=_("Complex attributes to be included into the response"),
-        )
-        fields_exclusive_group.add_argument(
-            "--exclude_fields",
-            metavar="exclude-fields",
-            help=_("Complex attributes to be excluded from the response"),
-        )
-        parser.add_argument(
-            "--exclude_default",
-            action="store_true",
-            default=False,
-            help=_("Indicates to exclude all complex attributes"
-                   " from the response. This argument can be used alone or"
-                   " with --fields and --filter. For all other combinations"
-                   " tacker server will throw bad request error"),
-        )
-        return parser
-
-    def case_modify(self, field):
-        return reduce(
-            lambda x, y: x + (' ' if y.isupper() else '') + y, field).title()
-
-    def get_attributes(self, extra_fields=None, all_fields=False,
-                       exclude_fields=None, exclude_default=False):
-        fields = ['id', 'vnfProductName', 'onboardingState',
-                  'usageState', 'operationalState', '_links']
-        complex_fields = [
-            'checksum',
-            'softwareImages',
-            'userDefinedData',
-            'additionalArtifacts']
-        simple_fields = ['vnfdVersion', 'vnfProvider', 'vnfSoftwareVersion',
-                         'vnfdId']
-
-        if extra_fields:
-            fields.extend(extra_fields)
-
-        if exclude_fields:
-            fields.extend([field for field in complex_fields
-                           if field not in exclude_fields])
-        if all_fields:
-            fields.extend(complex_fields)
-            fields.extend(simple_fields)
-
-        if exclude_default:
-            fields.extend(simple_fields)
-
-        attrs = []
-        for field in fields:
-            if field == '_links':
-                attrs.extend([(field, 'Links', tacker_osc_utils.LIST_BOTH)])
-            else:
-                attrs.extend([(field, self.case_modify(field),
-                               tacker_osc_utils.LIST_BOTH)])
-
-        return tuple(attrs)
-
-    def take_action(self, parsed_args):
-        _params = {}
-        extra_fields = []
-        exclude_fields = []
-        all_fields = False
-        exclude_default = False
-        if parsed_args.filter:
-            _params['filter'] = parsed_args.filter
-        if parsed_args.fields:
-            _params['fields'] = parsed_args.fields
-            fields = parsed_args.fields.split(',')
-            for field in fields:
-                extra_fields.append(field.split('/')[0])
-        if parsed_args.exclude_fields:
-            _params['exclude_fields'] = parsed_args.exclude_fields
-            fields = parsed_args.exclude_fields.split(',')
-            exclude_fields.extend(fields)
-        if parsed_args.exclude_default:
-            _params['exclude_default'] = None
-            exclude_default = True
-        if parsed_args.all_fields:
-            _params['all_fields'] = None
-            all_fields = True
-
-        client = self.app.client_manager.tackerclient
-        data = client.list_vnf_packages(**_params)
-        headers, columns = tacker_osc_utils.get_column_definitions(
-            self.get_attributes(extra_fields, all_fields, exclude_fields,
-                                exclude_default), long_listing=True)
-        return (headers,
-                (utils.get_dict_properties(
-                    s, columns, formatters=formatters,
-                    mixed_case_fields=_mixed_case_fields,
-                ) for s in data['vnf_packages']))
-
-
-class ShowVnfPackage(command.ShowOne):
-    _description = _("Show VNF Package Details")
-
-    def get_parser(self, prog_name):
-        LOG.debug('get_parser(%s)', prog_name)
-        parser = super(ShowVnfPackage, self).get_parser(prog_name)
-        parser.add_argument(
-            'vnf_package',
-            metavar="<vnf-package>",
-            help=_("VNF package ID")
-        )
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        vnf_package = client.show_vnf_package(parsed_args.vnf_package)
-        display_columns, columns = _get_columns(vnf_package)
-        data = utils.get_item_properties(
-            sdk_utils.DictModel(vnf_package),
-            columns, formatters=formatters,
-            mixed_case_fields=_mixed_case_fields)
-        return (display_columns, data)
-
-
-class UploadVnfPackage(command.Command):
-    _description = _("Upload VNF Package")
-
-    def get_parser(self, prog_name):
-        LOG.debug('get_parser(%s)', prog_name)
-        parser = super(UploadVnfPackage, self).get_parser(prog_name)
-        parser.add_argument(
-            'vnf_package',
-            metavar="<vnf-package>",
-            help=_("VNF package ID")
-        )
-        file_source = parser.add_mutually_exclusive_group(required=True)
-        file_source.add_argument(
-            "--path",
-            metavar="<file>",
-            help=_("Upload VNF CSAR package from local file"),
-        )
-        file_source.add_argument(
-            "--url",
-            metavar="<Uri>",
-            help=_("Uri of the VNF package content"),
-        )
-        parser.add_argument(
-            "--user-name",
-            metavar="<user-name>",
-            help=_("User name for authentication"),
-        )
-        parser.add_argument(
-            "--password",
-            metavar="<password>",
-            help=_("Password for authentication"),
-        )
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        attrs = {}
-        if parsed_args.user_name:
-            attrs['userName'] = parsed_args.user_name
-
-        if parsed_args.password:
-            attrs['password'] = parsed_args.password
-
-        if parsed_args.url:
-            attrs['url'] = parsed_args.url
-
-        file_data = None
-        try:
-            if parsed_args.path:
-                file_data = open(parsed_args.path, 'rb')
-            result = client.upload_vnf_package(parsed_args.vnf_package,
-                                               file_data, **attrs)
-            if not result:
-                print((_('Upload request for VNF package %(id)s has been'
-                         ' accepted.') % {'id': parsed_args.vnf_package}))
-        finally:
-            if file_data:
-                file_data.close()
-
-
-class DeleteVnfPackage(command.Command):
-    """Vnf package delete
-
-    Delete class supports bulk deletion of vnf packages, and error
-    handling.
-    """
-
-    _description = _("Delete VNF Package")
-
-    resource = 'vnf-package'
-
-    def get_parser(self, prog_name):
-        LOG.debug('get_parser(%s)', prog_name)
-        parser = super(DeleteVnfPackage, self).get_parser(prog_name)
-        parser.add_argument(
-            'vnf-package',
-            metavar="<vnf-package>",
-            nargs="+",
-            help=_("Vnf package(s) ID to delete")
-        )
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        failure = False
-        deleted_ids = []
-        failed_items = {}
-        resources = getattr(parsed_args, self.resource, [])
-        for resource_id in resources:
-            try:
-                vnf_package = client.show_vnf_package(resource_id)
-                client.delete_vnf_package(vnf_package['id'])
-                deleted_ids.append(resource_id)
-            except Exception as e:
-                failure = True
-                failed_items[resource_id] = e
-        if failure:
-            msg = ''
-            if deleted_ids:
-                msg = (_('Successfully deleted %(resource)s(s):'
-                         ' %(deleted_list)s') % {'deleted_list':
-                                                 ', '.join(deleted_ids),
-                                                 'resource': self.resource})
-            err_msg = _("\n\nUnable to delete the below"
-                        " 'vnf_package'(s):")
-            for failed_id, error in failed_items.items():
-                err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s')
-                            % {'failed_id': failed_id,
-                               'error': error})
-            msg += err_msg
-            raise exceptions.CommandError(message=msg)
-        else:
-            print((_('All specified %(resource)s(s) deleted successfully')
-                   % {'resource': self.resource}))
-        return
-
-
-class DownloadVnfPackage(command.Command):
-    _description = _("Download VNF package contents or VNFD of an on-boarded "
-                     "VNF package.")
-
-    def get_parser(self, prog_name):
-        parser = super(DownloadVnfPackage, self).get_parser(prog_name)
-        parser.add_argument(
-            "vnf_package",
-            metavar="<vnf-package>",
-            help=_("VNF package ID")
-        )
-        parser.add_argument(
-            "--file",
-            metavar="<FILE>",
-            help=_("Local file to save downloaded VNF Package or VNFD data. "
-                   "If this is not specified and there is no redirection "
-                   "then data will not be saved.")
-        )
-        parser.add_argument(
-            "--vnfd",
-            action="store_true",
-            default=False,
-            help=_("Download VNFD of an on-boarded vnf package."),
-        )
-        parser.add_argument(
-            "--type",
-            default="application/zip",
-            metavar="<type>",
-            choices=["text/plain", "application/zip", "both"],
-            help=_("Provide text/plain when VNFD is implemented as a single "
-                   "YAML file otherwise  use application/zip. If you are not "
-                   "aware whether VNFD is a single or multiple yaml files, "
-                   "then you can specify 'both' option value. "
-                   "Provide this option only when --vnfd is set.")
-        )
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        if parsed_args.vnfd:
-            if sys.stdout.isatty() and not (parsed_args.file and
-                                            parsed_args.type != "text/plain"):
-                msg = ("No redirection or local file specified for downloaded "
-                       "VNFD data. Please specify a local file with --file to "
-                       "save downloaded VNFD data or use redirection.")
-                sdk_utils.exit(msg)
-
-            body = client.download_vnfd_from_vnf_package(
-                parsed_args.vnf_package, parsed_args.type)
-
-            if not parsed_args.file:
-                print(body)
-                return
-        else:
-            body = client.download_vnf_package(parsed_args.vnf_package)
-
-        sdk_utils.save_data(body, parsed_args.file)
-
-
-class DownloadVnfPackageArtifact(command.Command):
-    _description = _("Download VNF package artifact of an on-boarded "
-                     "VNF package.")
-
-    def get_parser(self, prog_name):
-        parser = super(DownloadVnfPackageArtifact, self).get_parser(prog_name)
-        parser.add_argument(
-            "vnf_package",
-            metavar="<vnf-package>",
-            help=_("VNF package ID")
-        )
-        parser.add_argument(
-            "artifact_path",
-            metavar="<artifact-path>",
-            help=_("The artifact file's path")
-        )
-        parser.add_argument(
-            "--file",
-            metavar="<FILE>",
-            help=_("Local file to save downloaded VNF Package or VNFD data. "
-                   "If this is not specified and there is no redirection "
-                   "then data will not be saved.")
-        )
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        if sys.stdout.isatty() and not (parsed_args.file):
-            msg = (
-                "No redirection or local file specified for downloaded "
-                "vnf package artifact data. Please specify a "
-                "local file with --file to "
-                "save downloaded vnf package artifact data "
-                "or use redirection.")
-            sdk_utils.exit(msg)
-        body = client.download_artifact_from_vnf_package(
-            parsed_args.vnf_package, parsed_args.artifact_path)
-
-        if not parsed_args.file:
-            print(body)
-            return
-        else:
-            sdk_utils.save_data(body, parsed_args.file)
-
-
-class UpdateVnfPackage(command.ShowOne):
-    _description = _("Update information about an individual VNF package")
-
-    def get_parser(self, prog_name):
-        LOG.debug('get_parser(%s)', prog_name)
-        parser = super(UpdateVnfPackage, self).get_parser(prog_name)
-        parser.add_argument(
-            'vnf_package',
-            metavar="<vnf-package>",
-            help=_("VNF package ID")
-        )
-        parser.add_argument(
-            '--operational-state',
-            metavar="<operational-state>",
-            choices=['ENABLED', 'DISABLED'],
-            help=_("Change the operational state of VNF Package, Valid values"
-                   " are 'ENABLED' or 'DISABLED'.")
-        )
-        parser.add_argument(
-            '--user-data',
-            metavar='<key=value>',
-            action=parseractions.KeyValueAction,
-            help=_('User defined data for the VNF package '
-                   '(repeat option to set multiple user defined data)'),
-        )
-        return parser
-
-    def get_columns(self, updated_values):
-        column_map = {}
-        if updated_values.get('userDefinedData'):
-            column_map.update({'userDefinedData': 'User Defined Data'})
-
-        if updated_values.get('operationalState'):
-            column_map.update({'operationalState': 'Operational State'})
-
-        return sdk_utils.get_osc_show_columns_for_sdk_resource(updated_values,
-                                                               column_map)
-
-    def args2body(self, parsed_args):
-        body = {}
-        if not parsed_args.user_data and not parsed_args.operational_state:
-            msg = ('Provide at least one of the argument from "--user-data"'
-                   ' or "--operational-state"')
-            sdk_utils.exit(msg)
-        if parsed_args.user_data:
-            body["userDefinedData"] = parsed_args.user_data
-        if parsed_args.operational_state:
-            body["operationalState"] = parsed_args.operational_state
-        return body
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.tackerclient
-        updated_values = client.update_vnf_package(
-            parsed_args.vnf_package, self.args2body(parsed_args))
-        display_columns, columns = self.get_columns(updated_values)
-        data = utils.get_item_properties(
-            sdk_utils.DictModel(updated_values),
-            columns, formatters=formatters,
-            mixed_case_fields=_mixed_case_fields)
-        return (display_columns, data)

tackerclient/shell.py

@@ -18,6 +18,8 @@
 Command-line interface to the Tacker APIs
 """
 
+from __future__ import print_function
+
 import argparse
 import getpass
 import inspect
@@ -48,7 +50,6 @@ from tackerclient.tacker.v1_0 import extension
 from tackerclient.tacker.v1_0.nfvo import ns
 from tackerclient.tacker.v1_0.nfvo import nsd
 from tackerclient.tacker.v1_0.nfvo import vim
-from tackerclient.tacker.v1_0.nfvo import vnfcluster
 from tackerclient.tacker.v1_0.nfvo import vnffg
 from tackerclient.tacker.v1_0.nfvo import vnffgd
 from tackerclient.tacker.v1_0.vnfm import vnf
@@ -102,7 +103,6 @@ class BashCompletionCommand(openstack_command.OpenStackCommand):
     """Prints all of the commands and options for bash-completion."""
     resource = "bash_completion"
 
-
 COMMAND_V1 = {
     'bash-completion': BashCompletionCommand,
     'ext-list': extension.ListExt,
@@ -168,16 +168,6 @@ COMMAND_V1 = {
     'ns-list': ns.ListNS,
     'ns-delete': ns.DeleteNS,
     'ns-show': ns.ShowNS,
-
-    'cluster-create': vnfcluster.CreateCluster,
-    'cluster-delete': vnfcluster.DeleteCluster,
-    'cluster-list': vnfcluster.ListCluster,
-    'cluster-show': vnfcluster.ShowCluster,
-
-    'cluster-member-add': vnfcluster.AddClusterMember,
-    'cluster-member-show': vnfcluster.ShowClusterMember,
-    'cluster-member-list': vnfcluster.ListClusterMember,
-    'cluster-member-delete': vnfcluster.DeleteClusterMember,
 }
 
 COMMANDS = {'1.0': COMMAND_V1}
@@ -638,8 +628,8 @@ class TackerShell(app.App):
                                      self.options.os_project_domain_id)) or
                                 self.options.os_project_id)
 
-                if (not self.options.os_username and
-                        not self.options.os_user_id):
+                if (not self.options.os_username
+                        and not self.options.os_user_id):
                     raise exc.CommandError(
                         _("You must provide a username or user ID via"
                           "  --os-username, env[OS_USERNAME] or"

tackerclient/tacker/client.py

@@ -54,9 +54,9 @@ def make_client(instance):
                                auth=instance._auth)
         return client
     else:
-        raise exceptions.UnsupportedVersion(
-            reason=_("API version %s is not supported") %
-            instance._api_version[API_NAME])
+        raise exceptions.UnsupportedVersion(_("API version %s is not "
+                                              "supported") %
+                                            instance._api_version[API_NAME])
 
 
 def Client(api_version, *args, **kwargs):

tackerclient/tacker/v1_0/__init__.py

@@ -14,6 +14,8 @@
 #    under the License.
 #
 
+from __future__ import print_function
+
 import abc
 import argparse
 import logging
@@ -162,9 +164,9 @@ def _process_previous_argument(current_arg, _value_number, current_type_str,
                                values_specs):
     if current_arg is not None:
         if _value_number == 0 and (current_type_str or _list_flag):
-            # This kind of argument should have value
-            raise exceptions.CommandError(
-                message=_("Invalid values_specs %s") % ' '.join(values_specs))
+                # This kind of argument should have value
+                raise exceptions.CommandError(
+                    _("Invalid values_specs %s") % ' '.join(values_specs))
         if _value_number > 1 or _list_flag or current_type_str == 'list':
             current_arg.update({'nargs': '+'})
         elif _value_number == 0:
@@ -235,8 +237,7 @@ def parse_args_to_dict(values_specs):
                 _value_number = 0
             if _item in _options:
                 raise exceptions.CommandError(
-                    message=_("Duplicated "
-                              "options %s") % ' '.join(values_specs))
+                    _("Duplicated options %s") % ' '.join(values_specs))
             else:
                 _options.update({_item: {}})
             current_arg = _options[_item]
@@ -244,8 +245,7 @@ def parse_args_to_dict(values_specs):
         elif _item.startswith('type='):
             if current_arg is None:
                 raise exceptions.CommandError(
-                    message=_("Invalid "
-                              "values_specs %s") % ' '.join(values_specs))
+                    _("Invalid values_specs %s") % ' '.join(values_specs))
             if 'type' not in current_arg:
                 current_type_str = _item.split('=', 2)[1]
                 current_arg.update({'type': eval(current_type_str)})
@@ -267,8 +267,7 @@ def parse_args_to_dict(values_specs):
             if (not current_item or '=' in current_item or
                _item.startswith('-') and not is_number(_item)):
                 raise exceptions.CommandError(
-                    message=_("Invalid "
-                              "values_specs %s") % ' '.join(values_specs))
+                    _("Invalid values_specs %s") % ' '.join(values_specs))
             _value_number += 1
 
         _values_specs.append(_item)
@@ -280,7 +279,7 @@ def parse_args_to_dict(values_specs):
 
     # populate the parser with arguments
     _parser = argparse.ArgumentParser(add_help=False)
-    for opt, optspec in _options.items():
+    for opt, optspec in six.iteritems(_options):
         _parser.add_argument(opt, **optspec)
     _args = _parser.parse_args(_values_specs)
 
@@ -304,7 +303,7 @@ def _merge_args(qCmd, parsed_args, _extra_values, value_specs):
     @param values_specs: the unparsed unknown parts
     """
     temp_values = _extra_values.copy()
-    for key, value in temp_values.items():
+    for key, value in six.iteritems(temp_values):
         if hasattr(parsed_args, key):
             arg_value = getattr(parsed_args, key)
             if arg_value is not None and value is not None:
@@ -333,7 +332,6 @@ class TableFormater(table.TableFormatter):
 
     https://bugs.launchpad.net/python-tackerclient/+bug/1165962
     """
-
     def emit_list(self, column_names, data, stdout, parsed_args):
         if column_names:
             super(TableFormater, self).emit_list(column_names, data, stdout,
@@ -389,7 +387,7 @@ class TackerCommand(command.OpenStackCommand):
     def format_output_data(self, data):
         # Modify data to make it more readable
         if self.resource in data:
-            for k, v in data[self.resource].items():
+            for k, v in six.iteritems(data[self.resource]):
                 if isinstance(v, list):
                     value = '\n'.join(jsonutils.dumps(
                         i, indent=self.json_indent) if isinstance(i, dict)
@@ -452,7 +450,7 @@ class CreateCommand(TackerCommand, show.ShowOne):
                     info.pop(f)
         else:
             info = {'': ''}
-        return zip(*sorted(info.items()))
+        return zip(*sorted(six.iteritems(info)))
 
 
 class UpdateCommand(TackerCommand):
@@ -485,8 +483,7 @@ class UpdateCommand(TackerCommand):
             body[self.resource] = _extra_values
         if not body[self.resource]:
             raise exceptions.CommandError(
-                message=_("Must specify new"
-                          " values to update %s") % self.resource)
+                _("Must specify new values to update %s") % self.resource)
         if self.allow_names:
             _id = find_resourceid_by_name_or_id(
                 tacker_client, self.resource, parsed_args.id)
@@ -523,7 +520,6 @@ class DeleteCommand(TackerCommand):
             'ids', nargs='+',
             metavar=self.resource.upper(),
             help=help_str % self.resource)
-        self.add_known_arguments(parser)
         return parser
 
     def run(self, parsed_args):
@@ -534,8 +530,6 @@ class DeleteCommand(TackerCommand):
         tacker_client.format = parsed_args.request_format
         obj_deleter = getattr(tacker_client,
                               "delete_%s" % self.resource)
-        body = self.args2body(parsed_args)
-
         for resource_id in parsed_args.ids:
             try:
                 if self.allow_names:
@@ -543,10 +537,7 @@ class DeleteCommand(TackerCommand):
                         tacker_client, self.resource, resource_id)
                 else:
                     _id = resource_id
-                if body:
-                    obj_deleter(_id, body)
-                else:
-                    obj_deleter(_id)
+                obj_deleter(_id)
                 deleted_ids.append(resource_id)
             except Exception as e:
                 failure = True
@@ -562,14 +553,14 @@ class DeleteCommand(TackerCommand):
                                                  'resource': self.resource})
             err_msg = _("\n\nUnable to delete the below"
                         " %s(s):") % self.resource
-            for failed_id, error in failed_items.items():
+            for failed_id, error in failed_items.iteritems():
                 err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s')
                             % {'failed_id': failed_id,
                                'error': error})
             msg += err_msg
-            raise exceptions.CommandError(message=msg)
+            raise exceptions.CommandError(msg)
         else:
-            print((_('All specified %(resource)s(s) %(msg)s successfully')
+            print((_('All %(resource)s(s) %(msg)s successfully')
                    % {'msg': self.deleted_msg.get(self.resource, 'deleted'),
                       'resource': self.resource}))
         return
@@ -721,6 +712,6 @@ class ShowCommand(TackerCommand, show.ShowOne):
         self.format_output_data(data)
         resource = data[self.resource]
         if self.resource in data:
-            return zip(*sorted(resource.items()))
+            return zip(*sorted(six.iteritems(resource)))
         else:
             return None

tackerclient/tacker/v1_0/nfvo/ns.py

@@ -12,7 +12,6 @@
 
 import yaml
 
-from tackerclient.common import exceptions
 from tackerclient.i18n import _
 from tackerclient.tacker import v1_0 as tackerV10
 
@@ -25,8 +24,7 @@ class ListNS(tackerV10.ListCommand):
     """List NS that belong to a given tenant."""
 
     resource = _NS
-    list_columns = ['id', 'name', 'nsd_id', 'vnf_ids', 'vnffg_ids',
-                    'mgmt_ip_addresses', 'status']
+    list_columns = ['id', 'name', 'nsd_id', 'mgmt_urls', 'status']
 
 
 class ShowNS(tackerV10.ShowCommand):
@@ -52,9 +50,6 @@ class CreateNS(tackerV10.CreateCommand):
         nsd_group.add_argument(
             '--nsd-id',
             help=_('NSD ID to use as template to create NS'))
-        nsd_group.add_argument(
-            '--nsd-template',
-            help=_('NSD file to create NS'))
         nsd_group.add_argument(
             '--nsd-name',
             help=_('NSD name to use as template to create NS'))
@@ -82,36 +77,22 @@ class CreateNS(tackerV10.CreateCommand):
         tacker_client = self.get_client()
         tacker_client.format = parsed_args.request_format
         if parsed_args.vim_name:
-            _id = tackerV10.find_resourceid_by_name_or_id(tacker_client,
-                                                          'vim',
-                                                          parsed_args.
-                                                          vim_name)
-            parsed_args.vim_id = _id
+                _id = tackerV10.find_resourceid_by_name_or_id(tacker_client,
+                                                              'vim',
+                                                              parsed_args.
+                                                              vim_name)
+                parsed_args.vim_id = _id
         if parsed_args.nsd_name:
-            _id = tackerV10.find_resourceid_by_name_or_id(tacker_client,
-                                                          'nsd',
-                                                          parsed_args.
-                                                          nsd_name)
-            parsed_args.nsd_id = _id
-        elif parsed_args.nsd_template:
-            with open(parsed_args.nsd_template) as f:
-                template = f.read()
-            try:
-                args['nsd_template'] = yaml.load(
-                    template, Loader=yaml.SafeLoader)
-            except yaml.YAMLError as e:
-                raise exceptions.InvalidInput(reason=e)
-            if not args['nsd_template']:
-                raise exceptions.InvalidInput(reason='The nsd file is empty')
-
+                _id = tackerV10.find_resourceid_by_name_or_id(tacker_client,
+                                                              'nsd',
+                                                              parsed_args.
+                                                              nsd_name)
+                parsed_args.nsd_id = _id
         if parsed_args.param_file:
             with open(parsed_args.param_file) as f:
                 param_yaml = f.read()
-            try:
-                args['attributes']['param_values'] = yaml.load(
-                    param_yaml, Loader=yaml.SafeLoader)
-            except yaml.YAMLError as e:
-                raise exceptions.InvalidInput(reason=e)
+            args['attributes']['param_values'] = yaml.load(
+                param_yaml, Loader=yaml.SafeLoader)
         tackerV10.update_dict(parsed_args, body[self.resource],
                               ['tenant_id', 'name', 'description',
                                'nsd_id', 'vim_id'])
@@ -123,17 +104,3 @@ class DeleteNS(tackerV10.DeleteCommand):
 
     resource = _NS
     deleted_msg = {'ns': 'delete initiated'}
-
-    def add_known_arguments(self, parser):
-        parser.add_argument(
-            '--force',
-            default=False,
-            action='store_true',
-            help=_('Force delete Network Service'))
-
-    def args2body(self, parsed_args):
-        if parsed_args.force:
-            body = {self.resource: {'attributes': {'force': True}}}
-        else:
-            body = dict()
-        return body

tackerclient/tacker/v1_0/nfvo/nsd.py

@@ -10,6 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from __future__ import print_function
+
 import yaml
 
 from oslo_serialization import jsonutils
@@ -24,24 +26,7 @@ class ListNSD(tackerV10.ListCommand):
     """List NSDs that belong to a given tenant."""
 
     resource = _NSD
-    list_columns = ['id', 'name', 'template_source', 'description']
-
-    def get_parser(self, prog_name):
-        parser = super(ListNSD, self).get_parser(prog_name)
-        parser.add_argument(
-            '--template-source',
-            help=_("List NSD with specified template source. Available \
-                   options are 'onboared' (default), 'inline' or 'all'"),
-            action='store',
-            default='onboarded')
-        return parser
-
-    def args2search_opts(self, parsed_args):
-        search_opts = super(ListNSD, self).args2search_opts(parsed_args)
-        template_source = parsed_args.template_source
-        if parsed_args.template_source:
-            search_opts.update({'template_source': template_source})
-        return search_opts
+    list_columns = ['id', 'name', 'description']
 
 
 class ShowNSD(tackerV10.ShowCommand):

tackerclient/tacker/v1_0/nfvo/vim.py

@@ -30,8 +30,8 @@ class ListVIM(tackerV10.ListCommand):
     """List VIMs that belong to a given tenant."""
 
     resource = _VIM
-    list_columns = ['id', 'tenant_id', 'name', 'type', 'is_default',
-                    'placement_attr', 'status']
+    list_columns = ['id', 'tenant_id', 'name', 'type', 'description',
+                    'auth_url', 'placement_attr', 'auth_cred', 'status']
 
 
 class ShowVIM(tackerV10.ShowCommand):
@@ -67,11 +67,7 @@ class CreateVIM(tackerV10.CreateCommand):
         if parsed_args.config_file:
             with open(parsed_args.config_file) as f:
                 vim_config = f.read()
-                try:
-                    config_param = yaml.load(vim_config,
-                                             Loader=yaml.SafeLoader)
-                except yaml.YAMLError as e:
-                    raise exceptions.InvalidInput(reason=e)
+                config_param = yaml.load(vim_config, Loader=yaml.SafeLoader)
         vim_obj = body[self.resource]
         try:
             auth_url = config_param.pop('auth_url')
@@ -80,10 +76,11 @@ class CreateVIM(tackerV10.CreateCommand):
                                                            'specified',
                                                    status_code=404)
         vim_obj['auth_url'] = vim_utils.validate_auth_url(auth_url).geturl()
+        vim_obj['type'] = config_param.pop('type', 'openstack')
         vim_utils.args2body_vim(config_param, vim_obj)
         tackerV10.update_dict(parsed_args, body[self.resource],
                               ['tenant_id', 'name', 'description',
-                               'is_default'])
+                              'is_default'])
         return body
 
 
@@ -95,7 +92,7 @@ class UpdateVIM(tackerV10.UpdateCommand):
     def add_known_arguments(self, parser):
         parser.add_argument(
             '--config-file',
-            required=False,
+            required=True,
             help=_('YAML file with VIM configuration parameters'))
         parser.add_argument(
             '--name',
@@ -111,24 +108,20 @@ class UpdateVIM(tackerV10.UpdateCommand):
 
     def args2body(self, parsed_args):
         body = {self.resource: {}}
-        config_param = None
         # config arg passed as data overrides config yaml when both args passed
         if parsed_args.config_file:
             with open(parsed_args.config_file) as f:
                 config_yaml = f.read()
-            try:
-                config_param = yaml.load(config_yaml)
-            except yaml.YAMLError as e:
-                raise exceptions.InvalidInput(reason=e)
+            config_param = yaml.load(config_yaml)
+        if 'auth_url' in config_param:
+            raise exceptions.TackerClientException(message='Auth URL cannot '
+                                                           'be updated',
+                                                   status_code=404)
         vim_obj = body[self.resource]
-        if config_param is not None:
-            vim_utils.args2body_vim(config_param, vim_obj)
+        vim_utils.args2body_vim(config_param, vim_obj)
         tackerV10.update_dict(parsed_args, body[self.resource],
                               ['tenant_id', 'name', 'description',
                                'is_default'])
-        # type attribute is read-only, it can't be updated, so remove it
-        # in update method
-        body['vim'].pop('type', None)
         return body
 
 

tackerclient/tacker/v1_0/nfvo/vim_utils.py

@@ -24,59 +24,19 @@ def args2body_vim(config_param, vim):
     :param vim: vim request object
     :return: vim body with args populated
     """
-    vim_type = ['openstack', 'kubernetes']
-    cert_verify_type = ['True', 'False']
-
-    if 'type' in config_param:
-        vim['type'] = config_param.pop('type', '')
-        if not vim['type'] in vim_type:
-            raise exceptions.TackerClientException(
-                message='Supported VIM types: openstack, kubernetes',
-                status_code=400)
-    else:
-        vim['type'] = 'openstack'
-    if vim['type'] == 'openstack':
-        vim['vim_project'] = {
-            'name': config_param.pop('project_name', ''),
-            'project_domain_name':
-                config_param.pop('project_domain_name', '')}
-        if not vim['vim_project']['name']:
-            raise exceptions.TackerClientException(
-                message='Project name must be specified',
-                status_code=404)
-        cert_verify = config_param.pop('cert_verify', 'True')
-        if cert_verify not in cert_verify_type:
-            raise exceptions.TackerClientException(
-                message='Supported cert_verify types: True, False',
-                status_code=400)
-        vim['auth_cred'] = {'username': config_param.pop('username', ''),
-                            'password': config_param.pop('password', ''),
-                            'user_domain_name':
-                                config_param.pop('user_domain_name', ''),
-                            'cert_verify': cert_verify}
-    elif vim['type'] == 'kubernetes':
-        vim['vim_project'] = {
-            'name': config_param.pop('project_name', '')}
-        if not vim['vim_project']['name']:
-            raise exceptions.TackerClientException(
-                message='Project name must be specified in Kubernetes VIM,'
-                        'it is namespace in Kubernetes environment',
-                status_code=404)
-        if ('username' in config_param) and ('password' in config_param):
-            vim['auth_cred'] = {
-                'username': config_param.pop('username', ''),
-                'password': config_param.pop('password', '')}
-        elif 'bearer_token' in config_param:
-            vim['auth_cred'] = {
-                'bearer_token': config_param.pop('bearer_token', '')}
-        else:
-            raise exceptions.TackerClientException(
-                message='username and password or bearer_token must be'
-                        'provided',
-                status_code=404)
-        ssl_ca_cert = config_param.pop('ssl_ca_cert', '')
-        if ssl_ca_cert:
-            vim['auth_cred']['ssl_ca_cert'] = ssl_ca_cert
+    vim['vim_project'] = {'id': config_param.pop('project_id', ''),
+                          'name': config_param.pop('project_name', ''),
+                          'project_domain_name':
+                              config_param.pop('project_domain_name', '')}
+    if not vim['vim_project']['id'] and not vim['vim_project']['name']:
+        raise exceptions.TackerClientException(message='Project Id or name '
+                                                       'must be specified',
+                                               status_code=404)
+    vim['auth_cred'] = {'username': config_param.pop('username', ''),
+                        'password': config_param.pop('password', ''),
+                        'user_id': config_param.pop('user_id', ''),
+                        'user_domain_name':
+                            config_param.pop('user_domain_name', '')}
 
 
 def validate_auth_url(url):

tackerclient/tacker/v1_0/nfvo/vnfcluster.py

@@ -1,191 +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.
-
-from tackerclient.tacker import v1_0 as tackerV10
-import yaml
-
-_CLUSTER = 'cluster'
-_CLUSTER_MEMBER = 'clustermember'
-
-
-class ListCluster(tackerV10.ListCommand):
-    """List Clusters that belong to a given tenant."""
-
-    resource = _CLUSTER
-    list_columns = ['id', 'name', 'vnfd_id', 'status', 'vip_endpoint']
-
-
-class ShowCluster(tackerV10.ShowCommand):
-    """Show information of a given Cluster."""
-
-    resource = _CLUSTER
-
-
-class DeleteCluster(tackerV10.DeleteCommand):
-    """Delete a given Cluster."""
-
-    resource = _CLUSTER
-
-
-class CreateCluster(tackerV10.CreateCommand):
-    """Create a Cluster."""
-
-    resource = _CLUSTER
-
-    def add_known_arguments(self, parser):
-        parser.add_argument(
-            'name', metavar='NAME',
-            help='Set a name for the VNF cluster')
-        vnfd_group = parser.add_mutually_exclusive_group(required=True)
-        vnfd_group.add_argument(
-            '--vnfd-id',
-            help='VNFD ID to use as template to create member VNF')
-        vnfd_group.add_argument(
-            '--vnfd-name',
-            help='VNFD name to use as template to create member VNF')
-        parser.add_argument('--policy-file',
-                            help='Specify policy file for cluster',
-                            required=True)
-        parser.add_argument(
-            '--description',
-            help='Set a description for the created VNF cluster')
-
-    def args2body(self, parsed_args):
-        body = {self.resource: {}}
-        tacker_client = self.get_client()
-        tacker_client.format = parsed_args.request_format
-
-        if parsed_args.vnfd_name:
-            _id = tackerV10.find_resourceid_by_name_or_id(tacker_client,
-                                                          'vnfd',
-                                                          parsed_args.
-                                                          vnfd_name)
-            parsed_args.vnfd_id = _id
-        policy_info = None
-        with open(parsed_args.policy_file) as f:
-            policy_info = yaml.safe_load(f.read())
-        tackerV10.update_dict(parsed_args, body[self.resource],
-                              ['tenant_id', 'name', 'vnfd_id', 'description'])
-        if policy_info:
-            body[self.resource]['policy_info'] = policy_info
-        return body
-
-
-class AddClusterMember(tackerV10.CreateCommand):
-    """Add a new Cluster Member to given Cluster."""
-
-    resource = _CLUSTER_MEMBER
-
-    def add_known_arguments(self, parser):
-        parser.add_argument(
-            'name', metavar='NAME',
-            help='Set a name for the VNF cluster member')
-        cluster_group = parser.add_mutually_exclusive_group()
-        cluster_group.add_argument(
-            '--cluster-id',
-            help='VNFD ID to use as template to create member VNF')
-        cluster_group.add_argument(
-            '--cluster-name',
-            help='VNFD name to use as template to create member VNF')
-        vnfd_group = parser.add_mutually_exclusive_group()
-        vnfd_group.add_argument(
-            '--vnfd-id',
-            help='Set a id for the VNFD')
-        vnfd_group.add_argument(
-            '--vnfd-name',
-            help='Set a name for the VNFD')
-        parser.add_argument(
-            '--role',
-            help='Set a [Active/Standby] role to cluster member',
-            required=True)
-        vim_group = parser.add_mutually_exclusive_group()
-        vim_group.add_argument(
-            '--vim-id',
-            help='Set a VIM ID to deploy cluster member')
-        vim_group.add_argument(
-            '--vim-name',
-            help='Set a VIM name to deploy cluster member')
-
-    def args2body(self, parsed_args):
-        body = {self.resource: {}}
-
-        tacker_client = self.get_client()
-        tacker_client.format = parsed_args.request_format
-        if parsed_args.cluster_name:
-            _id = tackerV10.find_resourceid_by_name_or_id(tacker_client,
-                                                          'cluster',
-                                                          parsed_args.
-                                                          cluster_name)
-            parsed_args.cluster_id = _id
-        if parsed_args.vnfd_name:
-            _id = tackerV10.find_resourceid_by_name_or_id(tacker_client,
-                                                          'vnfd',
-                                                          parsed_args.
-                                                          vnfd_name)
-            parsed_args.vnfd_id = _id
-        parsed_args.role = parsed_args.role.upper()
-        if parsed_args.vim_name:
-            _id = tackerV10.find_resourceid_by_name_or_id(tacker_client,
-                                                          'vim',
-                                                          parsed_args.
-                                                          vim_name)
-            parsed_args.vim_id = _id
-        tackerV10.update_dict(parsed_args, body[self.resource],
-                              ['tenant_id', 'name', 'cluster_id', 'vnfd_id',
-                               'role', 'vim_id'])
-        return body
-
-
-class ListClusterMember(tackerV10.ListCommand):
-    """List Cluster Members that belong to a given tenant."""
-
-    resource = _CLUSTER_MEMBER
-
-    def add_known_arguments(self, parser):
-        cluster_group = parser.add_mutually_exclusive_group(required=True)
-        cluster_group.add_argument(
-            '--cluster-id',
-            help='Set a ID for the queried cluster')
-        cluster_group.add_argument(
-            '--cluster-name',
-            help='Set a name for the queried cluster')
-
-    def args2body(self, parsed_args):
-        body = {self.resource: {}}
-        tacker_client = self.get_client()
-        tacker_client.format = parsed_args.request_format
-
-        if parsed_args.cluster_name:
-            _id = tackerV10.find_resourceid_by_name_or_id(tacker_client,
-                                                          'cluster',
-                                                          parsed_args.
-                                                          cluster_name)
-            parsed_args.cluster_id = _id
-
-        tackerV10.update_dict(parsed_args, body[self.resource],
-                              ['tenant_id', 'cluster_id'])
-        return body
-
-    list_columns = ['id', 'name', 'cluster_id', 'role', 'vnf_id',
-                    'vim_id', 'mgmt_ip_address', 'lb_member_id']
-
-
-class DeleteClusterMember(tackerV10.DeleteCommand):
-    """Delete a given Cluster Member."""
-
-    resource = _CLUSTER_MEMBER
-
-
-class ShowClusterMember(tackerV10.ShowCommand):
-    """Show information of a given Cluster Member."""
-
-    resource = _CLUSTER_MEMBER

tackerclient/tacker/v1_0/nfvo/vnffg.py

@@ -10,10 +10,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from tackerclient.i18n import _
 import yaml
 
-from tackerclient.common import exceptions
-from tackerclient.i18n import _
 from tackerclient.tacker import v1_0 as tackerV10
 
 
@@ -29,18 +28,6 @@ class ListFC(tackerV10.ListCommand):
     resource = _FC
     list_columns = ['id', 'status', 'nfp_id', 'chain_id']
 
-    def extend_list(self, data, parsed_args):
-        """Update the list_columns list.
-
-        This method update the list_columns list by adding the
-        'name' column in case the retrieved FC list from the tacker
-        server side contains the names of the FCs.
-        """
-        for item in data:
-            if 'name' in item:
-                self.list_columns.insert(1, 'name')
-                break
-
 
 class ShowFC(tackerV10.ShowCommand):
     """Show information of a given FC."""
@@ -78,8 +65,7 @@ class ListVNFFG(tackerV10.ListCommand):
     """List VNFFGs that belong to a given tenant."""
 
     resource = _VNFFG
-    list_columns = ['id', 'name', 'ns_id',
-                    'description', 'status', 'vnffgd_id']
+    list_columns = ['id', 'name', 'description', 'status', 'vnffgd_id']
 
 
 class ShowVNFFG(tackerV10.ShowCommand):
@@ -105,17 +91,12 @@ class CreateVNFFG(tackerV10.CreateCommand):
         vnffgd_group.add_argument(
             '--vnffgd-name',
             help=_('VNFFGD Name to use as template to create VNFFG'))
-        vnffgd_group.add_argument(
-            '--vnffgd-template',
-            help=_('VNFFGD file to create VNFFG'))
         parser.add_argument(
             '--vnf-mapping',
             help=_('List of logical VNFD name to VNF instance name mapping.  '
                    'Example: VNF1:my_vnf1,VNF2:my_vnf2'))
         parser.add_argument(
-            '--symmetrical',
-            action='store_true',
-            default=False,
+            '--symmetrical', metavar='{True,False}',
             help=_('Should a reverse path be created for the NFP'))
         parser.add_argument(
             '--param-file',
@@ -146,26 +127,12 @@ class CreateVNFFG(tackerV10.CreateCommand):
                                                           parsed_args.
                                                           vnffgd_name)
             parsed_args.vnffgd_id = _id
-        elif parsed_args.vnffgd_template:
-            with open(parsed_args.vnffgd_template) as f:
-                template = f.read()
-            try:
-                args['vnffgd_template'] = yaml.load(
-                    template, Loader=yaml.SafeLoader)
-            except yaml.YAMLError as e:
-                raise exceptions.InvalidInput(reason=e)
-            if not args['vnffgd_template']:
-                raise exceptions.InvalidInput(
-                    reason='The vnffgd file is empty')
 
         if parsed_args.param_file:
             with open(parsed_args.param_file) as f:
                 param_yaml = f.read()
-            try:
-                args['attributes']['param_values'] = yaml.load(
-                    param_yaml, Loader=yaml.SafeLoader)
-            except yaml.YAMLError as e:
-                raise exceptions.InvalidInput(reason=e)
+            args['attributes']['param_values'] = yaml.load(
+                param_yaml, Loader=yaml.SafeLoader)
 
         tackerV10.update_dict(parsed_args, body[self.resource],
                               ['tenant_id', 'name', 'vnffgd_id',
@@ -179,23 +146,16 @@ class UpdateVNFFG(tackerV10.UpdateCommand):
     resource = _VNFFG
 
     def add_known_arguments(self, parser):
-        parser.add_argument(
-            '--vnffgd-template',
-            help=_('VNFFGD file to update VNFFG')
-        )
         parser.add_argument(
             '--vnf-mapping',
             help=_('List of logical VNFD name to VNF instance name mapping.  '
                    'Example: VNF1:my_vnf1,VNF2:my_vnf2'))
         parser.add_argument(
-            '--symmetrical',
-            action='store_true',
-            default=False,
+            '--symmetrical', metavar='{True,False}',
             help=_('Should a reverse path be created for the NFP'))
 
     def args2body(self, parsed_args):
-        args = {}
-        body = {self.resource: args}
+        body = {self.resource: {}}
 
         tacker_client = self.get_client()
         tacker_client.format = parsed_args.request_format
@@ -211,18 +171,6 @@ class UpdateVNFFG(tackerV10.UpdateCommand):
 
             parsed_args.vnf_mapping = _vnf_mapping
 
-        if parsed_args.vnffgd_template:
-            with open(parsed_args.vnffgd_template) as f:
-                template = f.read()
-            try:
-                args['vnffgd_template'] = yaml.load(
-                    template, Loader=yaml.SafeLoader)
-            except yaml.YAMLError as e:
-                raise exceptions.InvalidInput(reason=e)
-            if not args['vnffgd_template']:
-                raise exceptions.InvalidInput(
-                    reason='The vnffgd template is empty')
-
         tackerV10.update_dict(parsed_args, body[self.resource],
                               ['tenant_id', 'vnf_mapping', 'symmetrical'])
         return body

tackerclient/tacker/v1_0/nfvo/vnffgd.py

@@ -10,10 +10,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from __future__ import print_function
+
 import yaml
 
 from oslo_serialization import jsonutils
 
+from tackerclient.common import utils
 from tackerclient.i18n import _
 from tackerclient.tacker import v1_0 as tackerV10
 
@@ -24,24 +27,7 @@ class ListVNFFGD(tackerV10.ListCommand):
     """List VNFFGDs that belong to a given tenant."""
 
     resource = _VNFFGD
-    list_columns = ['id', 'name', 'template_source', 'description']
-
-    def get_parser(self, prog_name):
-        parser = super(ListVNFFGD, self).get_parser(prog_name)
-        parser.add_argument(
-            '--template-source',
-            help=_("List VNFFGD with specified template source. Available \
-                   options are 'onboarded' (default), 'inline' or 'all'"),
-            action='store',
-            default='onboarded')
-        return parser
-
-    def args2search_opts(self, parsed_args):
-        search_opts = super(ListVNFFGD, self).args2search_opts(parsed_args)
-        template_source = parsed_args.template_source
-        if parsed_args.template_source:
-            search_opts.update({'template_source': template_source})
-        return search_opts
+    list_columns = ['id', 'name', 'description']
 
 
 class ShowVNFFGD(tackerV10.ShowCommand):
@@ -56,7 +42,9 @@ class CreateVNFFGD(tackerV10.CreateCommand):
     remove_output_fields = ["attributes"]
 
     def add_known_arguments(self, parser):
-        parser.add_argument('--vnffgd-file', help=_('Specify VNFFGD file'))
+        group = parser.add_mutually_exclusive_group(required=True)
+        group.add_argument('--vnffgd-file', help=_('Specify VNFFGD file'))
+        group.add_argument('--vnffgd', help=_('Specify VNFFGD (DEPRECATED)'))
         parser.add_argument(
             'name', metavar='NAME',
             help=_('Set a name for the VNFFGD'))
@@ -70,6 +58,14 @@ class CreateVNFFGD(tackerV10.CreateCommand):
             with open(parsed_args.vnffgd_file) as f:
                 vnffgd = yaml.safe_load(f.read())
                 body[self.resource]['template'] = {'vnffgd': vnffgd}
+        if parsed_args.vnffgd:
+            # TODO(sridhar_ram): Only file based input supported starting
+            #       Ocata, remove all direct inputs in Pike
+            utils.deprecate_warning(what="Direct VNFFGD template input",
+                                    as_of="O",
+                                    remove_in=1)
+            body[self.resource]['template'] = {
+                'vnffgd': yaml.safe_load(parsed_args.vnffgd)}
         tackerV10.update_dict(parsed_args, body[self.resource],
                               ['tenant_id', 'name', 'description'])
         return body
@@ -89,7 +85,7 @@ class ShowTemplateVNFFGD(tackerV10.ShowCommand):
         template = None
         data = self.get_data(parsed_args)
         try:
-            attributes_index = data[0].index('template')
+            attributes_index = data[0].index('attributes')
             attributes_json = data[1][attributes_index]
             template = jsonutils.loads(attributes_json).get('vnffgd', None)
         except (IndexError, TypeError, ValueError) as e:

tackerclient/tacker/v1_0/vnfm/vnf.py

@@ -17,9 +17,7 @@
 
 import yaml
 
-from oslo_utils import encodeutils
-
-from tackerclient.common import exceptions
+from tackerclient.common import utils
 from tackerclient.i18n import _
 from tackerclient.tacker import v1_0 as tackerV10
 
@@ -32,7 +30,7 @@ class ListVNF(tackerV10.ListCommand):
     """List VNF that belong to a given tenant."""
 
     resource = _VNF
-    list_columns = ['id', 'name', 'mgmt_ip_address', 'status',
+    list_columns = ['id', 'name', 'mgmt_url', 'status',
                     'vim_id', 'vnfd_id']
 
 
@@ -78,6 +76,9 @@ class CreateVNF(tackerV10.CreateCommand):
         parser.add_argument(
             '--config-file',
             help=_('YAML file with VNF configuration'))
+        parser.add_argument(
+            '--config',
+            help=_('Specify config yaml data (DEPRECATED)'))
         parser.add_argument(
             '--param-file',
             help=_('Specify parameter yaml file'))
@@ -90,12 +91,18 @@ class CreateVNF(tackerV10.CreateCommand):
         if parsed_args.config_file:
             with open(parsed_args.config_file) as f:
                 config_yaml = f.read()
-            try:
-                config = yaml.load(
-                    config_yaml, Loader=yaml.SafeLoader)
-            except yaml.YAMLError as e:
-                raise exceptions.InvalidInput(reason=e)
+            config = yaml.load(
+                config_yaml, Loader=yaml.SafeLoader)
 
+        if parsed_args.config:
+            # TODO(sridhar_ram): Only file based input supported starting
+            #       Ocata, remove all direct inputs in Pike
+            utils.deprecate_warning(what="Direct config YAML input", as_of="O",
+                                    remove_in=1)
+            config = parsed_args.config
+            if isinstance(config, str) or isinstance(config, unicode):
+                config_str = parsed_args.config.decode('unicode_escape')
+                config = yaml.load(config_str, Loader=yaml.SafeLoader)
         if config:
             args['attributes']['config'] = config
         if parsed_args.vim_region_name:
@@ -105,34 +112,28 @@ class CreateVNF(tackerV10.CreateCommand):
         tacker_client = self.get_client()
         tacker_client.format = parsed_args.request_format
         if parsed_args.vim_name:
-            _id = tackerV10.find_resourceid_by_name_or_id(tacker_client,
-                                                          'vim',
-                                                          parsed_args.
-                                                          vim_name)
-            parsed_args.vim_id = _id
+                _id = tackerV10.find_resourceid_by_name_or_id(tacker_client,
+                                                              'vim',
+                                                              parsed_args.
+                                                              vim_name)
+                parsed_args.vim_id = _id
         if parsed_args.vnfd_name:
-            _id = tackerV10.find_resourceid_by_name_or_id(tacker_client,
-                                                          'vnfd',
-                                                          parsed_args.
-                                                          vnfd_name)
-            parsed_args.vnfd_id = _id
+                _id = tackerV10.find_resourceid_by_name_or_id(tacker_client,
+                                                              'vnfd',
+                                                              parsed_args.
+                                                              vnfd_name)
+                parsed_args.vnfd_id = _id
         elif parsed_args.vnfd_template:
             with open(parsed_args.vnfd_template) as f:
                 template = f.read()
-            try:
-                args['vnfd_template'] = yaml.load(
-                    template, Loader=yaml.SafeLoader)
-            except yaml.YAMLError as e:
-                raise exceptions.InvalidInput(reason=e)
+            args['vnfd_template'] = yaml.load(
+                template, Loader=yaml.SafeLoader)
 
         if parsed_args.param_file:
             with open(parsed_args.param_file) as f:
                 param_yaml = f.read()
-            try:
-                args['attributes']['param_values'] = yaml.load(
-                    param_yaml, Loader=yaml.SafeLoader)
-            except yaml.YAMLError as e:
-                raise exceptions.InvalidInput(reason=e)
+            args['attributes']['param_values'] = yaml.load(
+                param_yaml, Loader=yaml.SafeLoader)
         tackerV10.update_dict(parsed_args, body[self.resource],
                               ['tenant_id', 'name', 'description',
                                'vnfd_id', 'vim_id'])
@@ -145,16 +146,12 @@ class UpdateVNF(tackerV10.UpdateCommand):
     resource = _VNF
 
     def add_known_arguments(self, parser):
-        group = parser.add_mutually_exclusive_group()
-        group.add_argument(
+        parser.add_argument(
             '--config-file',
             help=_('YAML file with VNF configuration'))
-        group.add_argument(
+        parser.add_argument(
             '--config',
-            help=_('YAML data with VNF configuration'))
-        group.add_argument(
-            '--param-file',
-            help=_('YAML file with VNF parameter'))
+            help=_('Specify config yaml data'))
 
     def args2body(self, parsed_args):
         body = {self.resource: {}}
@@ -163,36 +160,14 @@ class UpdateVNF(tackerV10.UpdateCommand):
         if parsed_args.config_file:
             with open(parsed_args.config_file) as f:
                 config_yaml = f.read()
-            try:
-                config = yaml.load(config_yaml, Loader=yaml.SafeLoader)
-            except yaml.YAMLError as e:
-                raise exceptions.InvalidInput(reason=e)
-            if not config:
-                raise exceptions.InvalidInput(
-                    reason='The config file is empty')
+            config = yaml.load(config_yaml, Loader=yaml.SafeLoader)
         if parsed_args.config:
-            config_param = encodeutils.safe_decode(parsed_args.config)
-            try:
-                config = yaml.load(config_param, Loader=yaml.SafeLoader)
-            except yaml.YAMLError as e:
-                raise exceptions.InvalidInput(reason=e)
-            if not config:
-                raise exceptions.InvalidInput(
-                    reason='The parameter is empty')
+            config = parsed_args.config
+            if isinstance(config, str) or isinstance(config, unicode):
+                config_str = parsed_args.config.decode('unicode_escape')
+                config = yaml.load(config_str, Loader=yaml.SafeLoader)
         if config:
             body[self.resource]['attributes'] = {'config': config}
-        if parsed_args.param_file:
-            with open(parsed_args.param_file) as f:
-                param_yaml = f.read()
-            try:
-                param = yaml.load(
-                    param_yaml, Loader=yaml.SafeLoader)
-            except yaml.YAMLError as e:
-                raise exceptions.InvalidInput(reason=e)
-            if not param:
-                raise exceptions.InvalidInput(
-                    reason='The parameter file is empty')
-            body[self.resource]['attributes'] = {'param_values': param}
         tackerV10.update_dict(parsed_args, body[self.resource], ['tenant_id'])
         return body
 
@@ -201,23 +176,8 @@ class DeleteVNF(tackerV10.DeleteCommand):
     """Delete given VNF(s)."""
 
     resource = _VNF
-    remove_output_fields = ["attributes"]
     deleted_msg = {'vnf': 'delete initiated'}
 
-    def add_known_arguments(self, parser):
-        parser.add_argument(
-            '--force',
-            default=False,
-            action='store_true',
-            help=_('Force delete VNF instance'))
-
-    def args2body(self, parsed_args):
-        body = dict()
-        if parsed_args.force:
-            body[self.resource] = dict()
-            body[self.resource]['attributes'] = {'force': True}
-        return body
-
 
 class ListVNFResources(tackerV10.ListCommand):
     """List resources of a VNF like VDU, CP, etc."""

tackerclient/tacker/v1_0/vnfm/vnfd.py

@@ -15,10 +15,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from __future__ import print_function
+
 from oslo_serialization import jsonutils
 import yaml
 
-from tackerclient.common import exceptions
+from tackerclient.common import utils
 from tackerclient.i18n import _
 from tackerclient.tacker import v1_0 as tackerV10
 
@@ -63,7 +65,9 @@ class CreateVNFD(tackerV10.CreateCommand):
     remove_output_fields = ["attributes"]
 
     def add_known_arguments(self, parser):
-        parser.add_argument('--vnfd-file', help=_('Specify VNFD file'))
+        group = parser.add_mutually_exclusive_group(required=True)
+        group.add_argument('--vnfd-file', help=_('Specify VNFD file'))
+        group.add_argument('--vnfd', help=_('Specify VNFD (DEPRECATED)'))
         parser.add_argument(
             'name', metavar='NAME',
             help=_('Set a name for the VNFD'))
@@ -74,17 +78,23 @@ class CreateVNFD(tackerV10.CreateCommand):
     def args2body(self, parsed_args):
         body = {self.resource: {}}
         vnfd = None
-        if not parsed_args.vnfd_file:
-            raise exceptions.InvalidInput(reason="Invalid input for vnfd file")
-        with open(parsed_args.vnfd_file) as f:
-            vnfd = f.read()
-            try:
+        if parsed_args.vnfd_file:
+            with open(parsed_args.vnfd_file) as f:
+                vnfd = f.read()
                 vnfd = yaml.load(vnfd, Loader=yaml.SafeLoader)
-            except yaml.YAMLError as e:
-                raise exceptions.InvalidInput(reason=e)
-            if not vnfd:
-                raise exceptions.InvalidInput(reason="vnfd file is empty")
+        if parsed_args.vnfd:
+            # TODO(sridhar_ram): Only file based input supported starting
+            #       Ocata, remove all direct inputs in Pike
+            utils.deprecate_warning(what="Direct VNFD template input",
+                                    as_of="O",
+                                    remove_in=1)
+            vnfd = parsed_args.vnfd
+            if isinstance(vnfd, str) or isinstance(vnfd, unicode):
+                vnfd = yaml.load(vnfd, Loader=yaml.SafeLoader)
+
+        if vnfd:
             body[self.resource]['attributes'] = {'vnfd': vnfd}
+
         tackerV10.update_dict(parsed_args, body[self.resource],
                               ['tenant_id', 'name', 'description'])
         return body

tackerclient/tests/unit/osc/base.py

@@ -1,72 +0,0 @@
-# Copyright (C) 2019 NTT DATA
-# All Rights Reserved.
-#
-#    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.
-
-from requests_mock.contrib import fixture as requests_mock_fixture
-import testtools
-from unittest import mock
-
-from cliff import columns as cliff_columns
-
-
-class FixturedTestCase(testtools.TestCase):
-    client_fixture_class = None
-
-    def setUp(self):
-        super(FixturedTestCase, self).setUp()
-        self.app = mock.MagicMock()
-        if self.client_fixture_class:
-            self.requests_mock = self.useFixture(requests_mock_fixture.
-                                                 Fixture())
-            fix = self.client_fixture_class(self.requests_mock)
-            self.cs = self.useFixture(fix).client
-
-    def check_parser(self, cmd, args, verify_args):
-        cmd_parser = cmd.get_parser('check_parser')
-        try:
-            parsed_args = cmd_parser.parse_args(args)
-        except SystemExit:
-            raise ParserException
-        for av in verify_args:
-            attr, value = av
-            if attr:
-                self.assertIn(attr, parsed_args)
-                self.assertEqual(getattr(parsed_args, attr), value)
-        return parsed_args
-
-    def assertNotCalled(self, m, msg=None):
-        """Assert a function was not called"""
-
-        if m.called:
-            if not msg:
-                msg = 'method %s should not have been called' % m
-            self.fail(msg)
-
-    def assertListItemsEqual(self, expected, actual):
-        """Assertion based on human_readable values of list items"""
-
-        self.assertEqual(len(expected), len(actual))
-        for col_expected, col_actual in zip(expected, actual):
-            if isinstance(col_actual, tuple):
-                self.assertListItemsEqual(col_expected, col_actual)
-            elif isinstance(col_expected, cliff_columns.FormattableColumn):
-                self.assertIsInstance(col_actual, col_expected.__class__)
-                self.assertEqual(col_expected.human_readable(),
-                                 col_actual.human_readable())
-            else:
-                self.assertEqual(col_expected, col_actual)
-
-
-class ParserException(Exception):
-    pass

tackerclient/tests/unit/osc/samples/vnf_update_config.yaml

@@ -1,7 +0,0 @@
-auth_url: 'http://1.2.3.4:5000'
-username: 'xyz'
-password: '12345'
-project_name: 'abc'
-project_domain_name: 'prj_domain_name'
-user_domain_name: 'user_domain_name'
-type: 'openstack'

tackerclient/tests/unit/osc/samples/vnf_update_config_file_with_empty_dict.yaml

@@ -1 +0,0 @@
-{}

tackerclient/tests/unit/osc/samples/vnf_update_invalid_format_config.yaml

@@ -1,7 +0,0 @@
-auth_url: ][
-username: 'xyz'
-password: '12345'
-project_name: 'abc'
-project_domain_name: 'prj_domain_name'
-user_domain_name: 'user_domain_name'
-type: 'openstack'

tackerclient/tests/unit/osc/samples/vnf_update_invalid_format_param.yaml

@@ -1 +0,0 @@
-old_key: ][

tackerclient/tests/unit/osc/samples/vnf_update_param.yaml

@@ -1 +0,0 @@
-key: new-value

tackerclient/tests/unit/osc/samples/vnf_update_param_file_with_empty_dict.yaml

@@ -1 +0,0 @@
-{}

tackerclient/tests/unit/osc/v1/fixture_data/client.py

@@ -1,60 +0,0 @@
-# Copyright 2019 NTT DATA
-#
-# 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.
-
-import fixtures
-from keystoneauth1 import fixture
-from keystoneauth1 import loading
-from keystoneauth1 import session
-
-from tackerclient.v1_0 import client as proxy_client
-
-IDENTITY_URL = 'http://identityserver:5000/v3'
-TACKER_URL = 'http://nfv-orchestration'
-
-
-class ClientFixture(fixtures.Fixture):
-
-    def __init__(self, requests_mock, identity_url=IDENTITY_URL):
-        super(ClientFixture, self).__init__()
-        self.identity_url = identity_url
-        self.client = None
-        self.token = fixture.V2Token()
-        self.token.set_scope()
-        self.requests_mock = requests_mock
-        self.discovery = fixture.V2Discovery(href=self.identity_url)
-        s = self.token.add_service('nfv-orchestration')
-        s.add_endpoint(TACKER_URL)
-
-    def setUp(self):
-        super(ClientFixture, self).setUp()
-        auth_url = '%s/tokens' % self.identity_url
-        headers = {'X-Content-Type': 'application/json'}
-        self.requests_mock.post(auth_url, json=self.token, headers=headers)
-        self.requests_mock.get(self.identity_url, json=self.discovery,
-                               headers=headers)
-        self.client = self.new_client()
-
-    def new_client(self):
-        self.session = session.Session()
-        loader = loading.get_plugin_loader('password')
-        self.session.auth = loader.load_from_options(
-            auth_url=self.identity_url, username='xx', password='xx')
-
-        return proxy_client.Client(service_type='nfv-orchestration',
-                                   interface='public',
-                                   endpoint_type='public',
-                                   region_name='RegionOne',
-                                   auth_url=self.identity_url,
-                                   token=self.token.token_id,
-                                   endpoint_url=TACKER_URL)