Add the tests command to MoonClient.

Change-Id: I7f294e7f388af25473aba686958d4d9207580baf

1 files changed, 57 insertions, 13 deletions

diff --git a/moonclient/moonclient/tests/tests_tenants.json b/moonclient/moonclient/tests/tests_tenants.json
index 76e2b10c..ca2d228c 100644
--- a/moonclient/moonclient/tests/tests_tenants.json
+++ b/moonclient/moonclient/tests/tests_tenants.json
@@ -1,24 +1,32 @@
 {
-  "command_prefix": "moon",
+  "command_options": "-f value",
   "tests_group": {
     "group1": [
       {
         "name": "list tenant",
         "command": "tenant list",
-        "result": "^$",
+        "result": "(?!alt_demo)",
         "description": "List all tenants (must be empty)"
       },
       {
-        "name": "add tenant demo",
-        "command": "tenant add demo",
-        "result": "Tenant created: (?P<uuid>\\w+)",
-        "description": "Add a new tenant"
+        "name": "add tenant alt_demo",
+        "command": "tenant add alt_demo",
+        "result": "^$",
+        "description": "Add a new tenant",
+        "command_options": ""
+      },
+      {
+        "name": "check tenant alt_demo",
+        "command": "tenant list",
+        "result": "(?P<uuid>\\w+)\\s+alt_demo",
+        "description": "Check that tenant alt_demo has been correctly added"
       },
       {
         "name": "create_intraextension_admin",
-        "command": "intraextension create --policy_model policy_admin func_test",
-        "result": "%uuid_admin%",
-        "description": "Create an admin intra extension"
+        "command": "intraextension create --policy_model policy_admin admin_test",
+        "result": "IntraExtension created: (?P<uuid_admin>\\w+)",
+        "description": "Create an admin intra extension",
+        "command_options": ""
       },
       {
         "name": "list_intraextension_admin",
@@ -27,16 +35,52 @@
         "description": "Check the existence of that admin intra extension"
       },
       {
+        "name": "create_intraextension_authz",
+        "command": "intraextension create --policy_model policy_authz authz_test",
+        "result": "IntraExtension created: (?P<uuid_authz>\\w+)",
+        "description": "Create an authz intra extension",
+        "command_options": ""
+      },
+      {
+        "name": "list_intraextension_authz",
+        "command": "intraextension list",
+        "result": "$uuid_authz",
+        "description": "Check the existence of that authz intra extension"
+      },
+      {
         "name": "set_tenant_authz",
-        "command": "intraextension tenant set authz $uuid_authz demo",
+        "command": "tenant set --authz $uuid_authz demo",
         "result": "",
-        "description": "Connect the authz intra extension to the tenant demo"
+        "description": "Connect the authz intra extension to the tenant demo",
+        "command_options": ""
       },
       {
         "name": "set_tenant_admin",
-        "command": "intraextension tenant set authz $uuid_authz demo",
+        "command": "tenant set --admin $uuid_admin demo",
+        "result": "",
+        "description": "Connect the admin intra extension to the tenant demo",
+        "command_options": ""
+      },
+      {
+        "name": "delete_admin_intra_extension",
+        "command": "intraextension delete $uuid_admin",
+        "result": "",
+        "description": "Delete the admin intra extension",
+        "command_options": ""
+      },
+      {
+        "name": "delete_authz_intra_extension",
+        "command": "intraextension delete $uuid_authz",
+        "result": "",
+        "description": "Delete the authz intra extension",
+        "command_options": ""
+      },
+      {
+        "name": "delete_tenant",
+        "command": "tenant delete $uuid",
         "result": "",
-        "description": "Connect the admin intra extension to the tenant demo"
+        "description": "Delete the tenant alt_demo",
+        "command_options": ""
       }
     ]
   }