Merge "Add self attribute in test command to allow the execution of all internal tests (and update some test execution)."

8 files changed, 282 insertions, 21 deletions

diff --git a/moonclient/Changelog b/moonclient/Changelog
index f867b646..0ba076cc 100644
--- a/moonclient/Changelog
+++ b/moonclient/Changelog
@@ -7,6 +7,12 @@
 CHANGES
 =======
 
+0.2.0
+-----
+
+* Update tests command by adding a "--self" attribute
+
+
 0.1.0
 -----
 
diff --git a/moonclient/LICENSE b/moonclient/LICENSE
new file mode 100644
index 00000000..68c771a0
--- /dev/null
+++ b/moonclient/LICENSE
@@ -0,0 +1,176 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
diff --git a/moonclient/MANIFEST.in b/moonclient/MANIFEST.in
index c4bf4561..ef125662 100644
--- a/moonclient/MANIFEST.in
+++ b/moonclient/MANIFEST.in
@@ -1 +1,5 @@
-include README.rst
\ No newline at end of file
+include README.rst
+include Changelog
+include LICENSE
+include requirements.txt
+graft moonclient/tests
diff --git a/moonclient/moonclient/shell.py b/moonclient/moonclient/shell.py
index fa675dd9..f3d87ba3 100644
--- a/moonclient/moonclient/shell.py
+++ b/moonclient/moonclient/shell.py
@@ -11,6 +11,42 @@ import os
 
 from cliff.app import App
 from cliff.commandmanager import CommandManager
+from cliff.formatters.base import ListFormatter, SingleFormatter
+
+
+class _JSONFormatter(ListFormatter, SingleFormatter):
+
+    def add_argument_group(self, parser):
+        group = parser.add_argument_group(title='json formatter')
+        group.add_argument(
+            '--noindent',
+            action='store_true',
+            dest='noindent',
+            help='whether to disable indenting the JSON'
+        )
+        group.add_argument(
+            '--projectname',
+            help='Set the project name'
+        )
+
+    def emit_list(self, column_names, data, stdout, parsed_args):
+        items = []
+        import time
+        for item in data:
+            element = dict(zip(column_names, item))
+            element["project_name"] = parsed_args.projectname
+            element["name"] = element.pop("test_name")
+            element["url"] = ""
+            element["_id"] = ""
+            element["creation_date"] = time.strftime("%Y-%m-%d %H:%M:%S")
+            items.append(element)
+        indent = None if parsed_args.noindent else 2
+        json.dump({"testcases": items}, stdout, indent=indent)
+
+    def emit_one(self, column_names, data, stdout, parsed_args):
+        one = dict(zip(column_names, data))
+        indent = None if parsed_args.noindent else 2
+        json.dump(one, stdout, indent=indent)
 
 
 def get_env_creds(admin_token=False):
@@ -70,7 +106,7 @@ class MoonClient(App):
     def __init__(self):
         super(MoonClient, self).__init__(
             description='Moon Python Client',
-            version='0.1',
+            version='0.2.0',
             command_manager=CommandManager('moon.client'),
             )
         creds = get_env_creds()
@@ -230,6 +266,8 @@ class MoonClient(App):
         data = self.get_url("/v3/auth/tokens", post_data=self.post)
         if "token" not in data:
             raise Exception("Authentication problem ({})".format(data))
+        from cliff.formatters.json_format import JSONFormatter
+        JSONFormatter = _JSONFormatter
 
     def prepare_to_run_command(self, cmd):
         self.log.debug('prepare_to_run_command %s', cmd.__class__.__name__)
@@ -238,6 +276,7 @@ class MoonClient(App):
         self.log.debug('clean_up %s', cmd.__class__.__name__)
         if err:
             self.log.debug('got an error: %s', err)
+        self.log.debug("result: {}".format(result))
 
 
 def main(argv=sys.argv[1:]):
diff --git a/moonclient/moonclient/tests.py b/moonclient/moonclient/tests.py
index 5a33130c..f312eed2 100644
--- a/moonclient/moonclient/tests.py
+++ b/moonclient/moonclient/tests.py
@@ -28,12 +28,17 @@ class TestsLaunch(Lister):
     def get_parser(self, prog_name):
         parser = super(TestsLaunch, self).get_parser(prog_name)
         parser.add_argument(
-            '--stop-on-error',
+            '--stop-on-error', action="store_true",
             help='Stop the test on the first error',
         )
         parser.add_argument(
+            '--self', action="store_true",
+            help='Execute all internal tests',
+        )
+        parser.add_argument(
             'testfile',
             metavar='<filename(s)>',
+            nargs='?',
             help='Filenames that contains tests to run '
                  '(examples: /path/to/test.json, /path/to/directory/, '
                  '"/path/to/*-file.json" -- don\'t forget the quote)',
@@ -58,11 +63,12 @@ class TestsLaunch(Lister):
 
     def take_action(self, parsed_args):
         self.log.info("Write tests output to {}".format(self.logfile_name))
-        if not parsed_args.testfile:
-            self.log.error("You don't give a test filename.")
-            raise Exception("Cannot execute tests.")
-        if os.path.isfile(parsed_args.testfile):
-            return self.test_file(parsed_args.testfile)
+        if parsed_args.self:
+            import sys
+            import moonclient  # noqa
+            parsed_args.testfile = os.path.join(sys.modules['moonclient'].__path__[0], "tests")
+        if parsed_args.testfile and os.path.isfile(parsed_args.testfile):
+                    return self.test_file(parsed_args.testfile)
         else:
             cpt = 1
             filenames = []
diff --git a/moonclient/moonclient/tests/tests_empty_policy_new_user.json b/moonclient/moonclient/tests/tests_empty_policy_new_user.json
index 6caf34ee..2d24e02e 100644
--- a/moonclient/moonclient/tests/tests_empty_policy_new_user.json
+++ b/moonclient/moonclient/tests/tests_empty_policy_new_user.json
@@ -28,10 +28,16 @@
         "description": "Force the admin role for the user demo on the project admin (for testing purpose)."
       },
       {
+        "name": "neutron net-list",
+        "external_command": "neutron net-list",
+        "result": "(?P<uuid_net>[\\w-]+)\\s+\\| public",
+        "description": "Get an Net ID"
+      },
+      {
         "name": "nova boot new server",
-        "external_command": "nova boot  --flavor m1.tiny --image $uuid_image test_moonclient",
-        "result": "\\| OS-EXT-STS\\:vm_state\\s+\\| building",
-        "description": "Boot a new nova server."
+        "external_command": "nova boot  --flavor m1.tiny --image $uuid_image --nic net-id=$uuid_net test_moonclient",
+        "result": "(?P<uuid_image>[\\w-]+)\\s+\\| cirros-0.",
+        "description": "Get an Image ID"
       },
       {
         "name": "sleep",
@@ -3398,12 +3404,6 @@
         "result": "\\| (?P<uuid_server>[\\w\\-]+)\\s+\\| test_moonclient\\s+\\| ACTIVE\\s+\\| [\\w\\-]+\\s+\\| Running",
         "description": "Check that nova server is still in running state."
       },
-      {
-        "name": "pause",
-        "external_command": "read",
-        "result": "",
-        "description": "Pause"
-      },
 
       {
         "name": "list tenant",
@@ -3564,4 +3564,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/moonclient/moonclient/tests/tests_empty_policy_nova.json b/moonclient/moonclient/tests/tests_empty_policy_nova.json
index 521b1f1d..e1781c1f 100644
--- a/moonclient/moonclient/tests/tests_empty_policy_nova.json
+++ b/moonclient/moonclient/tests/tests_empty_policy_nova.json
@@ -10,13 +10,19 @@
       {
         "name": "nova image-list",
         "external_command": "nova image-list",
-        "result": "(?P<uuid_image>[\\w-]+)\\s+\\| cirros-0.3.4-x86_64-uec",
+        "result": "(?P<uuid_image>[\\w-]+)\\s+\\| cirros-0.*",
         "description": "Get an Image ID"
       },
       {
+        "name": "neutron net-list",
+        "external_command": "neutron net-list",
+        "result": "(?P<uuid_net>[\\w-]+)\\s+\\| public",
+        "description": "Get an Net ID"
+      },
+      {
         "name": "nova boot new server",
-        "external_command": "nova boot  --flavor m1.micro --image $uuid_image test_moonclient",
-        "result": "(?P<uuid_image>[\\w-]+)\\s+\\| cirros-0.3.4-x86_64-uec",
+        "external_command": "nova boot  --flavor m1.tiny --image $uuid_image --nic net-id=$uuid_net test_moonclient",
+        "result": "(?P<uuid_image>[\\w-]+)\\s+\\| cirros-0.",
         "description": "Get an Image ID"
       },
       {
diff --git a/moonclient/moonclient/tests/tests_external_commands.json b/moonclient/moonclient/tests/tests_external_commands.json
index bfb7ac1a..d94658cc 100644
--- a/moonclient/moonclient/tests/tests_external_commands.json
+++ b/moonclient/moonclient/tests/tests_external_commands.json
@@ -118,6 +118,30 @@
       },
 
       {
+        "name": "nova image-list",
+        "external_command": "nova image-list",
+        "result": "(?P<uuid_image>[\\w-]+)\\s+\\| cirros-0.",
+        "description": "Get an Image ID"
+      },
+      {
+        "name": "neutron net-list",
+        "external_command": "neutron net-list",
+        "result": "(?P<uuid_net>[\\w-]+)\\s+\\| public",
+        "description": "Get an Net ID"
+      },
+      {
+        "name": "nova boot new server",
+        "external_command": "nova boot  --flavor m1.tiny --image $uuid_image --nic net-id=$uuid_net test_moonclient",
+        "result": "(?P<uuid_image>[\\w-]+)\\s+\\| cirros-0.",
+        "description": "Get an Image ID"
+      },
+      {
+        "name": "sleep",
+        "external_command": "sleep 10",
+        "result": "",
+        "description": "time for server to really boot"
+      },
+      {
         "name": "check nova command",
         "external_command": "nova list",
         "result": "\\| (?P<uuid_server>[\\w\\-]+)\\s+\\| (?P<name_server>\\w+)\\s+\\| ACTIVE\\s+\\| [\\w\\-]+\\s+\\| Running",