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.

.gitreview

@@ -1,4 +1,5 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/python-watcherclient.git
+defaultbranch=stable/ocata

.zuul.yaml

@@ -0,0 +1,12 @@
+- project:
+    templates:
+      - openstack-python-jobs
+      - openstack-python35-jobs
+      - publish-openstack-sphinx-docs
+      - check-requirements
+      - openstackclient-plugin-jobs
+    check:
+      jobs:
+        - openstack-tox-cover:
+            voting: false
+

MANIFEST.in

@@ -1,6 +0,0 @@
-include AUTHORS
-include ChangeLog
-exclude .gitignore
-exclude .gitreview
-
-global-exclude *.pyc

doc/source/conf.py

@@ -1,4 +1,3 @@
-# -*- 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

openstack-common.conf

@@ -1,10 +0,0 @@
-[DEFAULT]
-
-# The list of modules to copy from oslo-incubator.git
-module=apiclient
-module=cliutils
-module=_i18n
-
-
-# The base module to hold the copy of openstack.common
-base=watcherclient

requirements.txt

@@ -9,6 +9,6 @@ oslo.i18n>=2.1.0 # Apache-2.0
 oslo.utils>=3.18.0 # Apache-2.0
 pbr>=1.8 # Apache-2.0
 PrettyTable<0.8,>=0.7.1 # BSD
-python-keystoneclient>=3.8.0 # Apache-2.0
+keystoneauth1>=2.18.0 # Apache-2.0
 six>=1.9.0 # MIT
 PyYAML>=3.10.0 # MIT

setup.cfg

@@ -28,7 +28,7 @@ console_scripts =
     watcher = watcherclient.shell:main
 
 openstack.cli.extension =
-    infra_optim = watcherclient.plugin
+    infra_optim = watcherclient.osc.plugin
 
 # Entry points for the 'openstack' command
 openstack.infra_optim.v1 =

tox.ini

@@ -6,10 +6,11 @@ skipsdist = True
 [testenv]
 usedevelop = True
 install_command =
-                  constraints: pip install -U --force-reinstall -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
+                  constraints: pip install -U --force-reinstall -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata} {opts} {packages}
                   pip install -U {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
+   OS_TEST_PATH=./watcherclient/tests/unit
 deps = -r{toxinidir}/test-requirements.txt
 commands = python setup.py testr --slowest --testr-args='{posargs}'
 
@@ -20,7 +21,9 @@ commands = flake8
 commands = {posargs}
 
 [testenv:cover]
-commands = python setup.py testr --coverage --testr-args='{posargs}'
+commands =
+   python setup.py testr --coverage --testr-args='{posargs}'
+   coverage report
 
 [testenv:docs]
 commands = python setup.py build_sphinx

watcherclient/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright 2013 Hewlett-Packard Development Company, L.P.
 # All Rights Reserved.

watcherclient/common/apiclient/base.py

@@ -317,7 +317,7 @@ class CrudManager(BaseManager):
 
     def _filter_kwargs(self, kwargs):
         """Drop null values and handle ids."""
-        for key, ref in six.iteritems(kwargs.copy()):
+        for key, ref in kwargs.copy().items():
             if ref is None:
                 kwargs.pop(key)
             else:
@@ -475,7 +475,7 @@ class Resource(object):
         return None
 
     def _add_details(self, info):
-        for (k, v) in six.iteritems(info):
+        for (k, v) in info.items():
             try:
                 setattr(self, k, v)
                 self._info[k] = v

watcherclient/common/apiclient/exceptions.py

@@ -421,7 +421,7 @@ class HttpVersionNotSupported(HttpServerError):
 # _code_map contains all the classes that have http_status attribute.
 _code_map = dict(
     (getattr(obj, 'http_status', None), obj)
-    for name, obj in six.iteritems(vars(sys.modules[__name__]))
+    for name, obj in vars(sys.modules[__name__]).items()
     if inspect.isclass(obj) and getattr(obj, 'http_status', False)
 )
 

watcherclient/common/base.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright 2012 OpenStack LLC.
 # All Rights Reserved.

watcherclient/common/cliutils.py

@@ -198,7 +198,7 @@ def print_dict(dct, dict_property="Property", wrap=0):
     """
     pt = prettytable.PrettyTable([dict_property, 'Value'])
     pt.align = 'l'
-    for k, v in six.iteritems(dct):
+    for k, v in dct.items():
         # convert dict to str to check length
         if isinstance(v, dict):
             v = six.text_type(v)

watcherclient/common/utils.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright 2012 OpenStack LLC.
 # All Rights Reserved.

watcherclient/exceptions.py

@@ -1,4 +1,3 @@
-# -*- 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

watcherclient/shell.py

@@ -25,7 +25,7 @@ from cliff import command
 from cliff import commandmanager
 from cliff import complete
 from cliff import help as cli_help
-from keystoneclient import session
+from keystoneauth1 import loading
 from osc_lib import logs
 from osc_lib import utils
 
@@ -165,7 +165,7 @@ class WatcherShell(app.App):
                                  "Service Catalog.")
         parser.epilog = ('See "watcher help COMMAND" for help '
                          'on a specific command.')
-        session.Session.register_cli_options(parser)
+        loading.register_session_argparse_arguments(parser)
         return parser
 
     def configure_logging(self):

watcherclient/tests/README.rst

@@ -0,0 +1,61 @@
+..
+      Except where otherwise noted, this document is licensed under Creative
+      Commons Attribution 3.0 License.  You can view the license at:
+
+          https://creativecommons.org/licenses/by/3.0/
+
+=======
+Testing
+=======
+
+.. _functional_tests:
+
+Functional tests
+================
+
+The following procedure gets you started with Tempest testing but you can also
+refer to the `Tempest documentation`_ for more details.
+
+.. _Tempest documentation: http://docs.openstack.org/developer/tempest/
+
+
+Tempest installation
+--------------------
+
+You need to install virtualenv, create a virtual environment and activate it::
+
+    $ pip install virtualenv
+    $ virtualenv watcher-env
+    $ source watcher-env/bin/activate
+
+Then, to install Tempest you can issue the following commands::
+
+    $ git clone https://github.com/openstack/tempest/
+    $ pip install tempest/
+
+There should be set environment variables using the OpenStack RC file. If
+you don't have RC file yet, create ``admin-openrc`` file and fill it using
+the following example::
+
+    export OS_PROJECT_DOMAIN_NAME=default
+    export OS_USER_DOMAIN_NAME=default
+    export OS_PROJECT_NAME=admin
+    export OS_USERNAME=admin
+    export OS_PASSWORD=admin
+    export OS_AUTH_URL=http://controller:35357/v3
+    export OS_IDENTITY_API_VERSION=3
+    export OS_IMAGE_API_VERSION=2
+
+Then, save file and execute ``source admin-openrc`` to set environment
+variables.
+
+To run functional tests you need to go to python-watcherclient folder, install
+all requirements and execute ``tempest run`` command::
+
+    $ pip install -r requirements.txt test-requirements.txt
+    $ pip install .
+    $ tempest run --regex watcherclient.tests.functional
+
+You can run specified test(s) by using regular expression::
+
+    $ tempest run --regex watcherclient.tests.functional.v1.test_action.ActionTests.test_action_list

watcherclient/tests/functional/v1/base.py

@@ -0,0 +1,108 @@
+#    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 re
+import shlex
+import subprocess
+import testtools
+
+import six
+from tempest.lib.cli import output_parser
+from tempest.lib import exceptions
+
+
+def execute(cmd, fail_ok=False, merge_stderr=False):
+    """Executes specified command for the given action."""
+    cmdlist = shlex.split(cmd)
+    stdout = subprocess.PIPE
+    stderr = subprocess.STDOUT if merge_stderr else subprocess.PIPE
+    proc = subprocess.Popen(cmdlist, stdout=stdout, stderr=stderr)
+    result, result_err = proc.communicate()
+    result = result.decode('utf-8')
+    if not fail_ok and proc.returncode != 0:
+        raise exceptions.CommandFailed(proc.returncode, cmd, result,
+                                       result_err)
+    return result
+
+
+class TestCase(testtools.TestCase):
+
+    delimiter_line = re.compile('^\+\-[\+\-]+\-\+$')
+
+    @classmethod
+    def watcher(cls, cmd, fail_ok=False):
+        """Executes watcherclient command for the given action."""
+        return execute('watcher {0}'.format(cmd), fail_ok=fail_ok)
+
+    @classmethod
+    def get_opts(cls, fields, format='value'):
+        return ' -f {0} {1}'.format(format,
+                                    ' '.join(['-c ' + it for it in fields]))
+
+    @classmethod
+    def assertOutput(cls, expected, actual):
+        if expected != actual:
+            raise Exception('{0} != {1}'.format(expected, actual))
+
+    @classmethod
+    def assertInOutput(cls, expected, actual):
+        if expected not in actual:
+            raise Exception('{0} not in {1}'.format(expected, actual))
+
+    def assert_table_structure(self, items, field_names):
+        """Verify that all items have keys listed in field_names."""
+        for item in items:
+            for field in field_names:
+                self.assertIn(field, item)
+
+    def assert_show_fields(self, items, field_names):
+        """Verify that all items have keys listed in field_names."""
+        for item in items:
+            for key in six.iterkeys(item):
+                self.assertIn(key, field_names)
+
+    def assert_show_structure(self, items, field_names):
+        """Verify that all field_names listed in keys of all items."""
+        if isinstance(items, list):
+            o = {}
+            for d in items:
+                o.update(d)
+        else:
+            o = items
+        item_keys = o.keys()
+        for field in field_names:
+            self.assertIn(field, item_keys)
+
+    @staticmethod
+    def parse_show_as_object(raw_output):
+        """Return a dict with values parsed from cli output."""
+        items = TestCase.parse_show(raw_output)
+        o = {}
+        for item in items:
+            o.update(item)
+        return o
+
+    @staticmethod
+    def parse_show(raw_output):
+        """Return list of dicts with item values parsed from cli output."""
+
+        items = []
+        table_ = output_parser.table(raw_output)
+        for row in table_['values']:
+            item = {}
+            item[row[0]] = row[1]
+            items.append(item)
+        return items
+
+    def parse_listing(self, raw_output):
+        """Return list of dicts with basic item parsed from cli output."""
+        return output_parser.listing(raw_output)

watcherclient/tests/functional/v1/test_action.py

@@ -0,0 +1,72 @@
+# -*- encoding: utf-8 -*-
+# Copyright (c) 2016 Servionica
+#
+# 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 oslo_utils import uuidutils
+
+from watcherclient.tests.functional.v1 import base
+
+
+class ActionTests(base.TestCase):
+    """Functional tests for action."""
+
+    dummy_name = 'dummy'
+    list_fields = ['UUID', 'Parents', 'State', 'Action Plan', 'Action']
+    detailed_list_fields = list_fields + ['Created At', 'Updated At',
+                                          'Deleted At', 'Parameters']
+    audit_template_name = 'a' + uuidutils.generate_uuid()
+    audit_uuid = None
+
+    @classmethod
+    def setUpClass(cls):
+        template_raw_output = cls.watcher(
+            'audittemplate create %s dummy -s dummy' % cls.audit_template_name)
+        template_output = cls.parse_show_as_object(template_raw_output)
+        audit_raw_output = cls.watcher(
+            'audit create -a %s' % template_output['Name'])
+        audit_output = cls.parse_show_as_object(audit_raw_output)
+        cls.audit_uuid = audit_output['UUID']
+
+    @classmethod
+    def tearDownClass(cls):
+        # Delete Action Plan and all related actions.
+        output = cls.parse_show(
+            cls.watcher('actionplan list --audit %s' % cls.audit_uuid))
+        action_plan_uuid = output[0].keys()[0]
+        raw_output = cls.watcher('actionplan delete %s' % action_plan_uuid)
+        cls.assertOutput('', raw_output)
+        # Delete audit
+        raw_output = cls.watcher('audit delete %s' % cls.audit_uuid)
+        cls.assertOutput('', raw_output)
+        # Delete Template
+        raw_output = cls.watcher(
+            'audittemplate delete %s' % cls.audit_template_name)
+        cls.assertOutput('', raw_output)
+
+    def test_action_list(self):
+        raw_output = self.watcher('action list')
+        self.assert_table_structure([raw_output], self.list_fields)
+
+    def test_action_detailed_list(self):
+        raw_output = self.watcher('action list --detail')
+        self.assert_table_structure([raw_output], self.detailed_list_fields)
+
+    def test_action_show(self):
+        action_list = self.parse_show(self.watcher('action list'))
+        action_uuid = action_list[0].keys()[0]
+        action = self.watcher('action show ' + action_uuid)
+        self.assertIn(action_uuid, action)
+        self.assert_table_structure([action],
+                                    self.detailed_list_fields)

watcherclient/tests/functional/v1/test_action_plan.py

@@ -0,0 +1,123 @@
+# -*- encoding: utf-8 -*-
+# Copyright (c) 2016 Servionica
+#
+# 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 oslo_utils import uuidutils
+
+from watcherclient.tests.functional.v1 import base
+
+
+class ActionPlanTests(base.TestCase):
+    """Functional tests for action plan."""
+
+    dummy_name = 'dummy'
+    list_fields = ['UUID', 'Audit', 'State', 'Updated At', 'Global efficacy']
+    detailed_list_fields = list_fields + ['Created At', 'Deleted At',
+                                          'Strategy', 'Efficacy indicators']
+    audit_template_name = 'a' + uuidutils.generate_uuid()
+    audit_uuid = None
+
+    @classmethod
+    def setUpClass(cls):
+        template_raw_output = cls.watcher(
+            'audittemplate create %s dummy -s dummy' % cls.audit_template_name)
+        template_output = cls.parse_show_as_object(template_raw_output)
+        audit_raw_output = cls.watcher('audit create -a %s'
+                                       % template_output['Name'])
+        audit_output = cls.parse_show_as_object(audit_raw_output)
+        cls.audit_uuid = audit_output['UUID']
+
+    @classmethod
+    def tearDownClass(cls):
+        # Delete action plan
+        output = cls.parse_show(
+            cls.watcher('actionplan list --audit %s' % cls.audit_uuid))
+        action_plan_uuid = output[0].keys()[0]
+        raw_output = cls.watcher('actionplan delete %s' % action_plan_uuid)
+        cls.assertOutput('', raw_output)
+        # Delete audit
+        raw_output = cls.watcher('audit delete %s' % cls.audit_uuid)
+        cls.assertOutput('', raw_output)
+        # Delete Template
+        raw_output = cls.watcher(
+            'audittemplate delete %s' % cls.audit_template_name)
+        cls.assertOutput('', raw_output)
+
+    def test_action_plan_list(self):
+        raw_output = self.watcher('actionplan list')
+        self.assert_table_structure([raw_output], self.list_fields)
+
+    def test_action_plan_detailed_list(self):
+        raw_output = self.watcher('actionplan list --detail')
+        self.assert_table_structure([raw_output], self.detailed_list_fields)
+
+    def test_action_plan_show(self):
+        action_plan_list = self.parse_show(self.watcher('actionplan list'))
+        action_plan_uuid = action_plan_list[0].keys()[0]
+        actionplan = self.watcher('actionplan show %s' % action_plan_uuid)
+        self.assertIn(action_plan_uuid, actionplan)
+        self.assert_table_structure([actionplan],
+                                    self.detailed_list_fields)
+
+    def test_action_plan_start(self):
+        output = self.parse_show(self.watcher('actionplan list --audit %s'
+                                              % self.audit_uuid))
+        action_plan_uuid = output[0].keys()[0]
+        self.watcher('actionplan start %s' % action_plan_uuid)
+        raw_output = self.watcher('actionplan show %s' % action_plan_uuid)
+        self.assert_table_structure([raw_output], self.detailed_list_fields)
+
+
+class ActionPlanActiveTests(base.TestCase):
+
+    audit_uuid = None
+    audit_template_name = 'b' + uuidutils.generate_uuid()
+
+    list_fields = ['UUID', 'Audit', 'State', 'Updated At', 'Global efficacy']
+    detailed_list_fields = list_fields + ['Created At', 'Deleted At',
+                                          'Strategy', 'Efficacy indicators']
+
+    def _delete_action_plan(self):
+        output = self.parse_show(
+            self.watcher('actionplan list --audit %s' % self.audit_uuid))
+        action_plan_uuid = output[0].keys()[0]
+        raw_output = self.watcher('actionplan delete %s' % action_plan_uuid)
+        self.assertOutput('', raw_output)
+
+    def _delete_audit(self):
+        raw_output = self.watcher('audit delete %s' % self.audit_uuid)
+        self.assertOutput('', raw_output)
+
+    def _delete_audit_template(self):
+        raw_output = self.watcher(
+            'audittemplate delete %s' % self.audit_template_name)
+        self.assertOutput('', raw_output)
+
+    def _create_audit_template(self):
+        template_raw_output = self.watcher(
+            'audittemplate create %s dummy -s dummy'
+            % self.audit_template_name)
+        template_output = self.parse_show_as_object(template_raw_output)
+        return template_output
+
+    def test_action_plan_create(self):
+        template_output = self._create_audit_template()
+        action_plan = self.watcher(
+            'actionplan create -a %s' % template_output['Name'])
+        self.audit_uuid = self.parse_show_as_object(action_plan)['UUID']
+        self.assert_table_structure([action_plan], self.detailed_list_fields)
+        self._delete_action_plan()
+        self._delete_audit()
+        self._delete_audit_template()

watcherclient/tests/functional/v1/test_audit.py

@@ -0,0 +1,114 @@
+# -*- encoding: utf-8 -*-
+# Copyright (c) 2016 Servionica
+#
+# 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 oslo_utils import uuidutils
+
+from watcherclient.tests.functional.v1 import base
+
+
+class AuditTests(base.TestCase):
+    """Functional tests for audit."""
+
+    dummy_name = 'dummy'
+    list_fields = ['UUID', 'Audit Type', 'State', 'Goal', 'Strategy']
+    detailed_list_fields = list_fields + ['Created At', 'Updated At',
+                                          'Deleted At', 'Parameters',
+                                          'Interval', 'Audit Scope']
+    audit_template_name = 'a' + uuidutils.generate_uuid()
+    audit_uuid = None
+
+    @classmethod
+    def setUpClass(cls):
+        raw_output = cls.watcher('audittemplate create %s dummy -s dummy'
+                                 % cls.audit_template_name)
+        template_output = cls.parse_show_as_object(raw_output)
+        audit_raw_output = cls.watcher(
+            'audit create -a %s' % template_output['Name'])
+        audit_output = cls.parse_show_as_object(audit_raw_output)
+        cls.audit_uuid = audit_output['UUID']
+
+    @classmethod
+    def tearDownClass(cls):
+        output = cls.parse_show(
+            cls.watcher('actionplan list --audit %s' % cls.audit_uuid))
+        action_plan_uuid = output[0].keys()[0]
+        cls.watcher('actionplan delete %s' % action_plan_uuid)
+        cls.watcher('audit delete %s' % cls.audit_uuid)
+        cls.watcher('audittemplate delete %s' % cls.audit_template_name)
+
+    def test_audit_list(self):
+        raw_output = self.watcher('audit list')
+        self.assert_table_structure([raw_output], self.list_fields)
+
+    def test_audit_detailed_list(self):
+        raw_output = self.watcher('audit list --detail')
+        self.assert_table_structure([raw_output], self.detailed_list_fields)
+
+    def test_audit_show(self):
+        audit = self.watcher('audit show ' + self.audit_uuid)
+        self.assertIn(self.audit_uuid, audit)
+        self.assert_table_structure([audit], self.detailed_list_fields)
+
+    def test_audit_update(self):
+        audit_raw_output = self.watcher('audit update %s add interval=2'
+                                        % self.audit_uuid)
+        audit_output = self.parse_show_as_object(audit_raw_output)
+        assert int(audit_output['Interval']) == 2
+
+
+class AuditActiveTests(base.TestCase):
+
+    list_fields = ['UUID', 'Audit Type', 'State', 'Goal', 'Strategy']
+    detailed_list_fields = list_fields + ['Created At', 'Updated At',
+                                          'Deleted At', 'Parameters',
+                                          'Interval', 'Audit Scope']
+    audit_template_name = 'a' + uuidutils.generate_uuid()
+    audit_uuid = None
+
+    def _create_audit(self):
+        raw_output = self.watcher('audittemplate create %s dummy -s dummy'
+                                  % self.audit_template_name)
+        template_output = self.parse_show_as_object(raw_output)
+        self.audit_uuid = self.parse_show_as_object(
+            self.watcher('audit create -a %s'
+                         % template_output['Name']))['UUID']
+
+    def _delete_audit(self):
+        output = self.parse_show(
+            self.watcher('actionplan list --audit %s' % self.audit_uuid))
+        action_plan_uuid = output[0].keys()[0]
+        self.watcher('actionplan delete %s' % action_plan_uuid)
+        self.watcher('audit delete %s' % self.audit_uuid)
+        self.watcher('audittemplate delete %s' % self.audit_template_name)
+
+    def test_create_audit(self):
+        raw_output = self.watcher('audittemplate create %s dummy -s dummy'
+                                  % self.audit_template_name)
+        template_output = self.parse_show_as_object(raw_output)
+        audit = self.watcher('audit create -a %s' % template_output['Name'])
+        self.audit_uuid = self.parse_show_as_object(audit)['UUID']
+        self.assert_table_structure([audit], self.detailed_list_fields)
+        self._delete_audit()
+
+    def test_delete_audit(self):
+        self._create_audit()
+        raw_output = self.watcher('audit delete %s' % self.audit_uuid)
+        self.assertOutput('', raw_output)
+        output = self.parse_show(
+            self.watcher('actionplan list --audit %s' % self.audit_uuid))
+        action_plan_uuid = output[0].keys()[0]
+        self.watcher('actionplan delete %s' % action_plan_uuid)
+        self.watcher('audittemplate delete %s' % self.audit_template_name)

watcherclient/tests/functional/v1/test_audit_template.py

@@ -0,0 +1,90 @@
+# -*- encoding: utf-8 -*-
+# Copyright (c) 2016 Servionica
+#
+# 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 oslo_utils import uuidutils
+
+from watcherclient.tests.functional.v1 import base
+
+
+class AuditTemplateTests(base.TestCase):
+    """Functional tests for audit template."""
+
+    dummy_name = 'dummy'
+    list_fields = ['UUID', 'Name', 'Goal', 'Strategy']
+    detailed_list_fields = list_fields + ['Created At', 'Updated At',
+                                          'Deleted At', 'Description',
+                                          'Audit Scope']
+    audit_template_name = 'a' + uuidutils.generate_uuid()
+
+    @classmethod
+    def setUpClass(cls):
+        cls.watcher('audittemplate create %s dummy -s dummy'
+                    % cls.audit_template_name)
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.watcher('audittemplate delete %s' % cls.audit_template_name)
+
+    def test_audit_template_list(self):
+        raw_output = self.watcher('audittemplate list')
+        self.assert_table_structure([raw_output], self.list_fields)
+
+    def test_audit_template_detailed_list(self):
+        raw_output = self.watcher('audittemplate list --detail')
+        self.assert_table_structure([raw_output], self.detailed_list_fields)
+
+    def test_audit_template_show(self):
+        audit_template = self.watcher(
+            'audittemplate show %s' % self.audit_template_name)
+        self.assertIn(self.audit_template_name, audit_template)
+        self.assert_table_structure([audit_template],
+                                    self.detailed_list_fields)
+
+    def test_audit_template_update(self):
+        raw_output = self.watcher('audittemplate update %s replace '
+                                  'description="Updated Desc"'
+                                  % self.audit_template_name)
+        audit_template_output = self.parse_show_as_object(raw_output)
+        assert audit_template_output['Description'] == 'Updated Desc'
+
+
+class AuditTemplateActiveTests(base.TestCase):
+
+    audit_template_name = 'b' + uuidutils.generate_uuid()
+    list_fields = ['UUID', 'Name', 'Goal', 'Strategy']
+    detailed_list_fields = list_fields + ['Created At', 'Updated At',
+                                          'Deleted At', 'Description',
+                                          'Audit Scope']
+
+    def _create_audit_template(self):
+        self.watcher('audittemplate create %s dummy -s dummy '
+                     '-d "Test Audit Template"' % self.audit_template_name)
+
+    def _delete_audit_template(self):
+        self.watcher('audittemplate delete %s' % self.audit_template_name)
+
+    def test_create_audit_template(self):
+        raw_output = self.watcher('audittemplate create %s dummy '
+                                  '-s dummy -d "Test Audit Template"'
+                                  % self.audit_template_name)
+        self.assert_table_structure([raw_output], self.detailed_list_fields)
+        self._delete_audit_template()
+
+    def test_delete_audit_template(self):
+        self._create_audit_template()
+        raw_output = self.watcher('audittemplate delete %s'
+                                  % self.audit_template_name)
+        self.assertOutput('', raw_output)

watcherclient/tests/functional/v1/test_goal.py

@@ -0,0 +1,42 @@
+# -*- encoding: utf-8 -*-
+# Copyright (c) 2016 Servionica
+#
+# 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 watcherclient.tests.functional.v1 import base
+
+
+class GoalTests(base.TestCase):
+    """Functional tests for goal."""
+
+    dummy_name = 'dummy'
+    list_fields = ['UUID', 'Name', 'Display name']
+
+    def test_goal_list(self):
+        raw_output = self.watcher('goal list')
+        self.assertIn(self.dummy_name, raw_output)
+        self.assert_table_structure([raw_output], self.list_fields)
+
+    def test_goal_detailed_list(self):
+        raw_output = self.watcher('goal list --detail')
+        self.assertIn(self.dummy_name, raw_output)
+        self.assert_table_structure(
+            [raw_output], self.list_fields + ['Efficacy specification'])
+
+    def test_goal_show(self):
+        raw_output = self.watcher('goal show %s' % self.dummy_name)
+        self.assertIn(self.dummy_name, raw_output)
+        self.assert_table_structure(
+            [raw_output], self.list_fields + ['Efficacy specification'])
+        self.assertNotIn('server_consolidation', raw_output)

watcherclient/tests/functional/v1/test_scoring_engine.py

@@ -0,0 +1,41 @@
+# -*- encoding: utf-8 -*-
+# Copyright (c) 2016 Servionica
+#
+# 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 watcherclient.tests.functional.v1 import base
+
+
+class ScoringEngineTests(base.TestCase):
+    """Functional tests for scoring engine."""
+
+    dummy_name = 'dummy_scorer'
+    list_fields = ['UUID', 'Name', 'Description']
+    detailed_list_fields = list_fields + ['Metainfo']
+
+    def test_scoringengine_list(self):
+        raw_output = self.watcher('scoringengine list')
+        self.assertIn(self.dummy_name, raw_output)
+        self.assert_table_structure([raw_output], self.list_fields)
+
+    def test_scoringengine_detailed_list(self):
+        raw_output = self.watcher('scoringengine list --detail')
+        self.assertIn(self.dummy_name, raw_output)
+        self.assert_table_structure([raw_output], self.detailed_list_fields)
+
+    def test_scoringengine_show(self):
+        raw_output = self.watcher('scoringengine show %s' % self.dummy_name)
+        self.assertIn(self.dummy_name, raw_output)
+        self.assert_table_structure([raw_output], self.detailed_list_fields)
+        self.assertNotIn('dummy_avg_scorer', raw_output)

watcherclient/tests/functional/v1/test_service.py

@@ -0,0 +1,46 @@
+# -*- encoding: utf-8 -*-
+# Copyright (c) 2016 Servionica
+#
+# 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 watcherclient.tests.functional.v1 import base
+
+
+class ServiceTests(base.TestCase):
+    """Functional tests for service."""
+
+    decision_engine_name = 'watcher-decision-engine'
+    applier_name = 'watcher-applier'
+    list_fields = ['ID', 'Name', 'Host', 'Status']
+
+    def test_service_list(self):
+        raw_output = self.watcher('service list')
+        self.assertIn(self.decision_engine_name, raw_output)
+        self.assertIn(self.applier_name, raw_output)
+        self.assert_table_structure([raw_output], self.list_fields)
+
+    def test_service_detailed_list(self):
+        raw_output = self.watcher('service list --detail')
+        self.assertIn(self.decision_engine_name, raw_output)
+        self.assertIn(self.applier_name, raw_output)
+        self.assert_table_structure([raw_output],
+                                    self.list_fields + ['Last seen up'])
+
+    def test_service_show(self):
+        raw_output = self.watcher('service show %s'
+                                  % self.decision_engine_name)
+        self.assertIn(self.decision_engine_name, raw_output)
+        self.assert_table_structure([raw_output],
+                                    self.list_fields + ['Last seen up'])
+        self.assertNotIn(self.applier_name, raw_output)

watcherclient/tests/functional/v1/test_strategy.py

@@ -0,0 +1,42 @@
+# -*- encoding: utf-8 -*-
+# Copyright (c) 2016 Servionica
+#
+# 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 watcherclient.tests.functional.v1 import base
+
+
+class StrategyTests(base.TestCase):
+    """Functional tests for strategy."""
+
+    dummy_name = 'dummy'
+    list_fields = ['UUID', 'Name', 'Display name', 'Goal']
+
+    def test_strategy_list(self):
+        raw_output = self.watcher('strategy list')
+        self.assertIn(self.dummy_name, raw_output)
+        self.assert_table_structure([raw_output], self.list_fields)
+
+    def test_strategy_detailed_list(self):
+        raw_output = self.watcher('strategy list --detail')
+        self.assertIn(self.dummy_name, raw_output)
+        self.assert_table_structure([raw_output],
+                                    self.list_fields + ['Parameters spec'])
+
+    def test_strategy_show(self):
+        raw_output = self.watcher('strategy show %s' % self.dummy_name)
+        self.assertIn(self.dummy_name, raw_output)
+        self.assert_table_structure([raw_output],
+                                    self.list_fields + ['Parameters spec'])
+        self.assertNotIn('basic', raw_output)

watcherclient/tests/unit/common/test_api_versioning.py

@@ -17,7 +17,7 @@ import mock
 
 from watcherclient.common import api_versioning
 from watcherclient import exceptions
-from watcherclient.tests import utils
+from watcherclient.tests.unit import utils
 
 
 class APIVersionTestCase(utils.BaseTestCase):

watcherclient/tests/unit/keystone_client_fixtures.py

@@ -13,8 +13,8 @@
 import json
 from oslo_utils import uuidutils
 
-from keystoneclient.fixture import v2 as ks_v2_fixture
-from keystoneclient.fixture import v3 as ks_v3_fixture
+from keystoneauth1.fixture import v2 as ks_v2_fixture
+from keystoneauth1.fixture import v3 as ks_v3_fixture
 
 # these are copied from python-keystoneclient tests
 BASE_HOST = 'http://keystone.example.com'
@@ -49,7 +49,7 @@ V3_VERSION = {'id': 'v3.0',
               'status': 'stable',
               'updated': UPDATED}
 
-TOKENID = uuidutils.generate_uuid()
+TOKENID = uuidutils.generate_uuid(dashed=False)
 
 
 def _create_version_list(versions):

watcherclient/tests/unit/test_client.py

@@ -17,7 +17,7 @@ from keystoneauth1 import loading as kaloading
 from watcherclient import client as watcherclient
 from watcherclient.common import httpclient
 from watcherclient import exceptions
-from watcherclient.tests import utils
+from watcherclient.tests.unit import utils
 
 
 class ClientTest(utils.BaseTestCase):

watcherclient/tests/unit/test_import.py

@@ -1,4 +1,3 @@
-# -*- 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
@@ -12,7 +11,7 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-from watcherclient.tests import utils
+from watcherclient.tests.unit import utils
 
 module_str = 'watcherclient'
 

watcherclient/tests/unit/test_utils.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright 2013 OpenStack LLC.
 # All Rights Reserved.
@@ -19,7 +18,7 @@ import mock
 
 from watcherclient.common.apiclient import exceptions as exc
 from watcherclient.common import utils
-from watcherclient.tests import utils as test_utils
+from watcherclient.tests.unit import utils as test_utils
 
 
 class UtilsTest(test_utils.BaseTestCase):

watcherclient/tests/unit/v1/base.py

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # Copyright (c) 2016 b<>com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +20,7 @@ import mock
 from osc_lib import utils as oscutils
 
 from watcherclient.common import httpclient
-from watcherclient.tests import utils
+from watcherclient.tests.unit import utils
 
 
 class CommandTestCase(utils.BaseTestCase):

watcherclient/tests/unit/v1/test_action.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
 #
@@ -18,7 +16,7 @@
 import testtools
 from testtools import matchers
 
-from watcherclient.tests import utils
+from watcherclient.tests.unit import utils
 import watcherclient.v1.action
 
 ACTION1 = {

watcherclient/tests/unit/v1/test_action_plan.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
 #
@@ -20,7 +18,7 @@ import copy
 import testtools
 from testtools import matchers
 
-from watcherclient.tests import utils
+from watcherclient.tests.unit import utils
 import watcherclient.v1.action_plan
 
 ACTION_PLAN1 = {

watcherclient/tests/unit/v1/test_action_plan_shell.py

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # Copyright (c) 2016 b<>com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,13 +14,12 @@
 # limitations under the License.
 
 import datetime
-
 import mock
 import six
 
 from watcherclient import exceptions
 from watcherclient import shell
-from watcherclient.tests.v1 import base
+from watcherclient.tests.unit.v1 import base
 from watcherclient import v1 as resource
 from watcherclient.v1 import resource_fields
 

watcherclient/tests/unit/v1/test_action_shell.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright 2013 IBM Corp
 #
@@ -15,13 +14,12 @@
 #   under the License.
 
 import datetime
-
 import mock
 import six
 
 from watcherclient import exceptions
 from watcherclient import shell
-from watcherclient.tests.v1 import base
+from watcherclient.tests.unit.v1 import base
 from watcherclient import v1 as resource
 from watcherclient.v1 import resource_fields
 
@@ -30,7 +28,7 @@ ACTION_1 = {
     'action_plan_uuid': 'f8e47706-efcf-49a4-a5c4-af604eb492f2',
     'state': 'PENDING',
     'action_type': 'migrate',
-    'next_uuid': '239f02a5-9649-4e14-9d33-ac2bf67cb755',
+    'parents': ['239f02a5-9649-4e14-9d33-ac2bf67cb755'],
     'input_parameters': {"test": 1},
     'created_at': datetime.datetime.now().isoformat(),
     'updated_at': None,
@@ -42,7 +40,7 @@ ACTION_2 = {
     'action_plan_uuid': 'f8e47706-efcf-49a4-a5c4-af604eb492f2',
     'state': 'PENDING',
     'action_type': 'migrate',
-    'next_uuid': '67653274-eb24-c7ba-70f6-a84e73d80843',
+    'parents': ['67653274-eb24-c7ba-70f6-a84e73d80843'],
     'input_parameters': {"test": 2},
     'created_at': datetime.datetime.now().isoformat(),
     'updated_at': None,
@@ -52,7 +50,7 @@ ACTION_2 = {
 ACTION_3 = {
     'uuid': '67653274-eb24-c7ba-70f6-a84e73d80843',
     'action_plan_uuid': 'a5199d0e-0702-4613-9234-5ae2af8dafea',
-    'next_uuid': None,
+    'parents': [],
     'state': 'PENDING',
     'action_type': 'sleep',
     'created_at': datetime.datetime.now().isoformat(),

watcherclient/tests/unit/v1/test_audit.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
 #
@@ -20,7 +18,7 @@ import copy
 import testtools
 from testtools import matchers
 
-from watcherclient.tests import utils
+from watcherclient.tests.unit import utils
 import watcherclient.v1.audit
 
 
@@ -127,6 +125,26 @@ fake_responses_sorting = {
     },
 }
 
+fake_responses_goal = {
+    '/v1/audits/?goal=dummy':
+    {
+        'GET': (
+            {},
+            {"audits": [AUDIT2, AUDIT1]}
+        ),
+    },
+}
+
+fake_responses_strategy = {
+    '/v1/audits/?strategy=dummy':
+    {
+        'GET': (
+            {},
+            {"audits": [AUDIT1]}
+        ),
+    },
+}
+
 
 class AuditManagerTest(testtools.TestCase):
     def setUp(self):
@@ -191,6 +209,26 @@ class AuditManagerTest(testtools.TestCase):
         self.assertEqual(expect, self.api.calls)
         self.assertEqual(2, len(audits))
 
+    def test_audits_list_goal(self):
+        self.api = utils.FakeAPI(fake_responses_goal)
+        self.mgr = watcherclient.v1.audit.AuditManager(self.api)
+        audits = self.mgr.list(goal='dummy')
+        expect = [
+            ('GET', '/v1/audits/?goal=dummy', {}, None)
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(2, len(audits))
+
+    def test_audits_list_strategy(self):
+        self.api = utils.FakeAPI(fake_responses_strategy)
+        self.mgr = watcherclient.v1.audit.AuditManager(self.api)
+        audits = self.mgr.list(strategy='dummy')
+        expect = [
+            ('GET', '/v1/audits/?strategy=dummy', {}, None)
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(1, len(audits))
+
     def test_audits_show(self):
         audit = self.mgr.get(AUDIT1['uuid'])
         expect = [

watcherclient/tests/unit/v1/test_audit_shell.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright 2013 IBM Corp
 #
@@ -15,13 +14,12 @@
 #   under the License.
 
 import datetime
-
 import mock
 import six
 
 from watcherclient import exceptions
 from watcherclient import shell
-from watcherclient.tests.v1 import base
+from watcherclient.tests.unit.v1 import base
 from watcherclient import v1 as resource
 from watcherclient.v1 import resource_fields
 
@@ -69,6 +67,7 @@ AUDIT_1 = {
     'parameters': None,
     'interval': None,
     'scope': '',
+    'auto_trigger': False,
 }
 
 AUDIT_2 = {
@@ -78,13 +77,14 @@ AUDIT_2 = {
     'audit_template_uuid': 'f8e47706-efcf-49a4-a5c4-af604eb492f2',
     'audit_template_name': 'at1',
     'goal_name': 'fc087747-61be-4aad-8126-b701731ae836',
-    'strategy_name': None,
+    'strategy_name': 'auto',
     'created_at': datetime.datetime.now().isoformat(),
     'updated_at': None,
     'deleted_at': None,
     'parameters': None,
     'interval': None,
     'scope': '',
+    'auto_trigger': False,
 }
 
 AUDIT_3 = {
@@ -94,13 +94,14 @@ AUDIT_3 = {
     'audit_template_uuid': 'f8e47706-efcf-49a4-a5c4-af604eb492f2',
     'audit_template_name': 'at1',
     'goal_name': None,
-    'strategy_name': None,
+    'strategy_name': 'auto',
     'created_at': datetime.datetime.now().isoformat(),
     'updated_at': None,
     'deleted_at': None,
     'parameters': None,
     'interval': 3600,
     'scope': '',
+    'auto_trigger': True,
 }
 
 
@@ -284,7 +285,7 @@ class AuditShellTest(base.CommandTestCase):
             result)
         self.m_audit_mgr.create.assert_called_once_with(
             audit_template_uuid='f8e47706-efcf-49a4-a5c4-af604eb492f2',
-            audit_type='ONESHOT')
+            audit_type='ONESHOT', auto_trigger=False)
 
     def test_do_audit_create_with_audit_template_name(self):
         audit = resource.Audit(mock.Mock(), AUDIT_3)
@@ -300,6 +301,7 @@ class AuditShellTest(base.CommandTestCase):
             result)
         self.m_audit_mgr.create.assert_called_once_with(
             audit_template_uuid='f8e47706-efcf-49a4-a5c4-af604eb492f2',
+            auto_trigger=False,
             audit_type='ONESHOT')
 
     def test_do_audit_create_with_goal(self):
@@ -315,6 +317,7 @@ class AuditShellTest(base.CommandTestCase):
             result)
         self.m_audit_mgr.create.assert_called_once_with(
             goal='fc087747-61be-4aad-8126-b701731ae836',
+            auto_trigger=False,
             audit_type='ONESHOT'
         )
 
@@ -333,6 +336,7 @@ class AuditShellTest(base.CommandTestCase):
         self.m_audit_mgr.create.assert_called_once_with(
             goal='fc087747-61be-4aad-8126-b701731ae836',
             strategy='2cf86250-d309-4b81-818e-1537f3dba6e5',
+            auto_trigger=False,
             audit_type='ONESHOT'
         )
 
@@ -349,7 +353,7 @@ class AuditShellTest(base.CommandTestCase):
             result)
         self.m_audit_mgr.create.assert_called_once_with(
             goal='fc087747-61be-4aad-8126-b701731ae836',
-            audit_type='ONESHOT')
+            auto_trigger=False, audit_type='ONESHOT')
 
     def test_do_audit_create_with_parameter(self):
         audit = resource.Audit(mock.Mock(), AUDIT_1)
@@ -366,6 +370,7 @@ class AuditShellTest(base.CommandTestCase):
         self.m_audit_mgr.create.assert_called_once_with(
             goal='fc087747-61be-4aad-8126-b701731ae836',
             audit_type='ONESHOT',
+            auto_trigger=False,
             parameters={'para1': 10, 'para2': 20})
 
     def test_do_audit_create_with_type_continuous(self):
@@ -383,4 +388,5 @@ class AuditShellTest(base.CommandTestCase):
         self.m_audit_mgr.create.assert_called_once_with(
             goal='fc087747-61be-4aad-8126-b701731ae836',
             audit_type='CONTINUOUS',
+            auto_trigger=False,
             interval='3600')

watcherclient/tests/unit/v1/test_audit_template.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
 #
@@ -20,7 +18,7 @@ import copy
 from six.moves.urllib import parse as urlparse
 from testtools import matchers
 
-from watcherclient.tests import utils
+from watcherclient.tests.unit import utils
 import watcherclient.v1.audit_template
 
 AUDIT_TMPL1 = {

watcherclient/tests/unit/v1/test_audit_template_shell.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright 2013 IBM Corp
 #
@@ -15,12 +14,11 @@
 #   under the License.
 
 import datetime
-
 import mock
 import six
 
 from watcherclient import shell
-from watcherclient.tests.v1 import base
+from watcherclient.tests.unit.v1 import base
 from watcherclient import v1 as resource
 from watcherclient.v1 import resource_fields
 

watcherclient/tests/unit/v1/test_goal.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
 #
@@ -19,7 +17,7 @@
 import testtools
 from testtools import matchers
 
-from watcherclient.tests import utils
+from watcherclient.tests.unit import utils
 import watcherclient.v1.goal
 
 GOAL1 = {

watcherclient/tests/unit/v1/test_goal_shell.py

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # Copyright (c) 2016 b<>com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,12 +14,11 @@
 # limitations under the License.
 
 import datetime
-
 import mock
 import six
 
 from watcherclient import shell
-from watcherclient.tests.v1 import base
+from watcherclient.tests.unit.v1 import base
 from watcherclient import v1 as resource
 from watcherclient.v1 import resource_fields
 

watcherclient/tests/unit/v1/test_scoring_engine.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright 2016 Intel
 #
@@ -18,7 +17,7 @@
 import testtools
 from testtools import matchers
 
-from watcherclient.tests import utils
+from watcherclient.tests.unit import utils
 import watcherclient.v1.scoring_engine
 
 SE1 = {

watcherclient/tests/unit/v1/test_scoring_engine_shell.py

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # Copyright (c) 2016 Intel
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,12 +14,11 @@
 # limitations under the License.
 
 import datetime
-
 import mock
 import six
 
 from watcherclient import shell
-from watcherclient.tests.v1 import base
+from watcherclient.tests.unit.v1 import base
 from watcherclient import v1 as resource
 from watcherclient.v1 import resource_fields
 

watcherclient/tests/unit/v1/test_service.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
 #
@@ -19,7 +17,7 @@
 import testtools
 from testtools import matchers
 
-from watcherclient.tests import utils
+from watcherclient.tests.unit import utils
 import watcherclient.v1.service
 
 SERVICE1 = {

watcherclient/tests/unit/v1/test_service_shell.py

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # Copyright (c) 2016 Servionica
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,12 +14,11 @@
 # limitations under the License.
 
 import datetime
-
 import mock
 import six
 
 from watcherclient import shell
-from watcherclient.tests.v1 import base
+from watcherclient.tests.unit.v1 import base
 from watcherclient import v1 as resource
 from watcherclient.v1 import resource_fields
 

watcherclient/tests/unit/v1/test_strategy.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
 #
@@ -19,7 +17,7 @@
 import testtools
 from testtools import matchers
 
-from watcherclient.tests import utils
+from watcherclient.tests.unit import utils
 import watcherclient.v1.strategy
 
 STRATEGY1 = {

watcherclient/tests/unit/v1/test_strategy_shell.py

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # Copyright (c) 2016 b<>com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,12 +14,11 @@
 # limitations under the License.
 
 import datetime
-
 import mock
 import six
 
 from watcherclient import shell
-from watcherclient.tests.v1 import base
+from watcherclient.tests.unit.v1 import base
 from watcherclient import v1 as resource
 from watcherclient.v1 import resource_fields
 

watcherclient/v1/__init__.py

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # Copyright (c) 2016 b<>com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

watcherclient/v1/action.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright 2013 Red Hat, Inc.
 #

watcherclient/v1/action_plan.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright 2013 Red Hat, Inc.
 #

watcherclient/v1/action_plan_shell.py

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # Copyright (c) 2016 b<>com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,7 +29,7 @@ def format_global_efficacy(global_efficacy):
     formatted_global_efficacy = None
     if (global_efficacy.get('value') is not None and
             global_efficacy.get('unit')):
-        formatted_global_efficacy = "%(value)s %(unit)s" % dict(
+        formatted_global_efficacy = "%(value).2f %(unit)s" % dict(
             unit=global_efficacy.get('unit'),
             value=global_efficacy.get('value'))
     elif global_efficacy.get('value') is not None:

watcherclient/v1/action_shell.py

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # Copyright (c) 2016 b<>com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

watcherclient/v1/audit.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright 2013 Red Hat, Inc.
 #
@@ -20,7 +19,7 @@ from watcherclient import exceptions as exc
 
 
 CREATION_ATTRIBUTES = ['audit_template_uuid', 'audit_type', 'interval',
-                       'parameters', 'goal', 'strategy']
+                       'parameters', 'goal', 'strategy', 'auto_trigger']
 
 
 class Audit(base.Resource):
@@ -36,7 +35,7 @@ class AuditManager(base.Manager):
         return '/v1/audits/%s' % id if id else '/v1/audits'
 
     def list(self, audit_template=None, limit=None, sort_key=None,
-             sort_dir=None, detail=False):
+             sort_dir=None, detail=False, goal=None, strategy=None):
         """Retrieve a list of audit.
 
         :param audit_template: Name of the audit
@@ -67,6 +66,10 @@ class AuditManager(base.Manager):
         filters = utils.common_filters(limit, sort_key, sort_dir)
         if audit_template is not None:
             filters.append('audit_template=%s' % audit_template)
+        if goal is not None:
+            filters.append('goal=%s' % goal)
+        if strategy is not None:
+            filters.append('strategy=%s' % strategy)
 
         path = ''
         if detail:

watcherclient/v1/audit_shell.py

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # Copyright (c) 2016 b<>com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -41,6 +40,8 @@ class ShowAudit(command.ShowOne):
 
         try:
             audit = client.audit.get(parsed_args.audit)
+            if audit.strategy_name is None:
+                audit.strategy_name = 'auto'
         except exceptions.HTTPNotFound as exc:
             raise exceptions.CommandError(str(exc))
 
@@ -115,6 +116,9 @@ class ListAudit(command.Lister):
 
         try:
             data = client.audit.list(**params)
+            for audit in data:
+                if audit.strategy_name is None:
+                    audit.strategy_name = 'auto'
         except exceptions.HTTPNotFound as ex:
             raise exceptions.CommandError(str(ex))
 
@@ -146,7 +150,8 @@ class CreateAudit(command.ShowOne):
             '-i', '--interval',
             dest='interval',
             metavar='<interval>',
-            help=_("Audit interval."))
+            help=_('Audit interval (in seconds). '
+                   "Only used if the audit is CONTINUOUS."))
         parser.add_argument(
             '-g', '--goal',
             dest='goal',
@@ -162,13 +167,20 @@ class CreateAudit(command.ShowOne):
             dest='audit_template_uuid',
             metavar='<audit_template>',
             help=_('Audit template used for this audit (name or uuid).'))
+        parser.add_argument(
+            '--auto-trigger',
+            dest='auto_trigger',
+            action='store_true',
+            default=False,
+            help=_('Trigger automatically action plan '
+                   'once audit is succeeded.'))
         return parser
 
     def take_action(self, parsed_args):
         client = getattr(self.app.client_manager, "infra-optim")
 
         field_list = ['audit_template_uuid', 'audit_type', 'parameters',
-                      'interval', 'goal', 'strategy']
+                      'interval', 'goal', 'strategy', 'auto_trigger']
 
         fields = dict((k, v) for (k, v) in vars(parsed_args).items()
                       if k in field_list and v is not None)
@@ -189,6 +201,8 @@ class CreateAudit(command.ShowOne):
                     fields['strategy']).uuid
 
         audit = client.audit.create(**fields)
+        if audit.strategy_name is None:
+            audit.strategy_name = 'auto'
 
         columns = res_fields.AUDIT_FIELDS
         column_headers = res_fields.AUDIT_FIELD_LABELS

watcherclient/v1/audit_template.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright 2013 Red Hat, Inc.
 #

watcherclient/v1/audit_template_shell.py

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # Copyright (c) 2016 b<>com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -155,7 +154,7 @@ class CreateAuditTemplate(command.ShowOne):
         parser.add_argument(
             '-d', '--description',
             metavar='<description>',
-            help=_('Descrition of the audit template.'))
+            help=_('Description of the audit template.'))
         parser.add_argument(
             '--scope',
             metavar='<path>',

watcherclient/v1/goal.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright 2013 Red Hat, Inc.
 #

watcherclient/v1/goal_shell.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright 2013 Red Hat, Inc.
 # All Rights Reserved.
@@ -80,7 +79,7 @@ class ListGoal(command.Lister):
             dest='detail',
             action='store_true',
             default=False,
-            help=_("Show detailed information about metric collectors."))
+            help=_("Show detailed information about each goal."))
         parser.add_argument(
             '--limit',
             metavar='<limit>',

watcherclient/v1/resource_fields.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright 2015 b<>com
 # All Rights Reserved.
@@ -33,17 +32,18 @@ AUDIT_TEMPLATE_SHORT_LIST_FIELD_LABELS = ['UUID', 'Name', 'Goal', 'Strategy']
 # Audit
 AUDIT_FIELDS = ['uuid', 'created_at', 'updated_at', 'deleted_at',
                 'state', 'audit_type', 'parameters', 'interval', 'goal_name',
-                'strategy_name', 'scope']
+                'strategy_name', 'scope', 'auto_trigger']
 
 AUDIT_FIELD_LABELS = ['UUID', 'Created At', 'Updated At', 'Deleted At',
                       'State', 'Audit Type', 'Parameters', 'Interval', 'Goal',
-                      'Strategy', 'Audit Scope']
+                      'Strategy', 'Audit Scope', 'Auto Trigger']
 
 AUDIT_SHORT_LIST_FIELDS = ['uuid', 'audit_type',
-                           'state', 'goal_name', 'strategy_name']
+                           'state', 'goal_name', 'strategy_name',
+                           'auto_trigger']
 
 AUDIT_SHORT_LIST_FIELD_LABELS = ['UUID', 'Audit Type', 'State', 'Goal',
-                                 'Strategy']
+                                 'Strategy', 'Auto Trigger']
 
 # Action Plan
 ACTION_PLAN_FIELDS = ['uuid', 'created_at', 'updated_at', 'deleted_at',
@@ -61,18 +61,18 @@ ACTION_PLAN_SHORT_LIST_FIELD_LABELS = ['UUID', 'Audit', 'State',
                                        'Updated At', 'Global efficacy']
 
 # Action
-ACTION_FIELDS = ['uuid', 'created_at', 'updated_at', 'deleted_at', 'next_uuid',
+ACTION_FIELDS = ['uuid', 'created_at', 'updated_at', 'deleted_at', 'parents',
                  'state', 'action_plan_uuid', 'action_type',
                  'input_parameters']
 
 ACTION_FIELD_LABELS = ['UUID', 'Created At', 'Updated At', 'Deleted At',
-                       'Next Action', 'State', 'Action Plan', 'Action',
+                       'Parents', 'State', 'Action Plan', 'Action',
                        'Parameters']
 
-ACTION_SHORT_LIST_FIELDS = ['uuid', 'next_uuid',
+ACTION_SHORT_LIST_FIELDS = ['uuid', 'parents',
                             'state', 'action_plan_uuid', 'action_type']
 
-ACTION_SHORT_LIST_FIELD_LABELS = ['UUID', 'Next Action', 'State',
+ACTION_SHORT_LIST_FIELD_LABELS = ['UUID', 'Parents', 'State',
                                   'Action Plan', 'Action']
 # Goals
 

watcherclient/v1/scoring_engine.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright 2016 Intel
 #

watcherclient/v1/scoring_engine_shell.py

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # Copyright (c) 2016 Intel
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

watcherclient/v1/service.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright 2016 Servionica
 #

watcherclient/v1/service_shell.py

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # Copyright (c) 2016 Servionica
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

watcherclient/v1/strategy.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Copyright 2013 Red Hat, Inc.
 #

watcherclient/v1/strategy_shell.py

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 # Copyright (c) 2016 b<>com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");